diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 18:08:52 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 18:08:52 +0400 |
commit | 37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec (patch) | |
tree | 408d5c54b0601dfc20847c78799ddffc1bf75750 /arch/ia64 | |
parent | aa77677e0a288e08073620db5d2a31df83ca4788 (diff) | |
parent | 08613e4626c06ca408fc55071f6aedee36986a87 (diff) | |
download | linux-37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec.tar.xz |
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 'arch/ia64')
0 files changed, 0 insertions, 0 deletions