]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 00:45:02 +0000 (16:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Mar 2011 00:45:02 +0000 (16:45 -0800)
commit9d9ded2c138840aebc771307210c8741e1080e02
tree47b2795e160b0f095840ded0bb7f4c7af237eb41
parent81f487af7695c29a424769c7dac326028a6b0a4f
parenta5062c2e2d8c44233c5c13e24261fcd722829648
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  net: don't allow CAP_NET_ADMIN to load non-netdev kernel modules