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)
commitab02a9540541dd7b2012f32f5e311c3cbd772387
tree47b2795e160b0f095840ded0bb7f4c7af237eb41
parent684adca4f84365ca327e06dba696b62de7a79eca
parent8909c9ad8ff03611c9c96c9a92656213e4bb495b
Merge branch 'for-linus' of git://git./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