Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Dec 2011 01:35:33 +0000 (17:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Dec 2011 01:35:33 +0000 (17:35 -0800)
commit50b2abed6b0812cbeda9f6dd48cc4c247be80643
tree43da2b779fafe2d86c63ae1db4725db84b148588
parent7578ed02e4b08c9b7b07443b44cf0ccfdf55c91e
parentaef950b4ba3196622a5bd5e21ab1d63f30658285
Merge git://git./linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  packet: fix possible dev refcnt leak when bind fail
  netem: dont call vfree() under spinlock and BH disabled
  netfilter: ctnetlink: fix scheduling while atomic if helper is autoloaded
  netfilter: ctnetlink: fix return value of ctnetlink_get_expect()