]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitefff4d5db5a22c94076237e3f236c838473f8ee5
tree43da2b779fafe2d86c63ae1db4725db84b148588
parent19290b9c9a4f48e7b0ff8434a1d873aabe8585f4
parent3e0b5e9b5b17406620191d322f0ef51a2df17ffe
Merge git://git.kernel.org/pub/scm/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()