diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 16:08:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 16:08:52 +0200 |
| commit | 37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec (patch) | |
| tree | 408d5c54b0601dfc20847c78799ddffc1bf75750 /net/sctp/bind_addr.c | |
| parent | Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | caif: Fix BUG() with network namespaces (diff) | |
| download | linux-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/sctp/bind_addr.c')
0 files changed, 0 insertions, 0 deletions