summaryrefslogtreecommitdiffstats
path: root/net/appletalk
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 16:08:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-26 16:08:52 +0200
commit37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec (patch)
tree408d5c54b0601dfc20847c78799ddffc1bf75750 /net/appletalk
parentMerge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentcaif: Fix BUG() with network namespaces (diff)
downloadlinux-37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec.tar.xz
linux-37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: caif: Fix BUG() with network namespaces net: make bonding slaves honour master's skb->priority net: Unlock sock before calling sk_free()
Diffstat (limited to 'net/appletalk')
0 files changed, 0 insertions, 0 deletions