diff options
author | 2011-07-14 07:56:40 -0700 | |
---|---|---|
committer | 2011-07-14 07:56:40 -0700 | |
commit | 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f (patch) | |
tree | 86b15d8cd3e25c97b348b5a61bdb16c02726a480 /net/sctp/auth.c | |
parent | net: Embed hh_cache inside of struct neighbour. (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc (diff) | |
download | linux-dev-6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f.tar.xz linux-dev-6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'net/sctp/auth.c')
0 files changed, 0 insertions, 0 deletions