Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 14:08:52 +0000 (16:08 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 14:08:52 +0000 (16:08 +0200)
commit37d96c28ecf0af1215bb6bbf580dbb1fabb5a6ec
tree408d5c54b0601dfc20847c78799ddffc1bf75750
parentaa77677e0a288e08073620db5d2a31df83ca4788
parent08613e4626c06ca408fc55071f6aedee36986a87
Merge git://git./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()