diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 16:45:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 16:45:02 -0800 |
commit | ab02a9540541dd7b2012f32f5e311c3cbd772387 (patch) | |
tree | 47b2795e160b0f095840ded0bb7f4c7af237eb41 /arch/powerpc/kernel/paca.c | |
parent | 684adca4f84365ca327e06dba696b62de7a79eca (diff) | |
parent | 8909c9ad8ff03611c9c96c9a92656213e4bb495b (diff) | |
download | op-kernel-dev-ab02a9540541dd7b2012f32f5e311c3cbd772387.zip op-kernel-dev-ab02a9540541dd7b2012f32f5e311c3cbd772387.tar.gz |
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
Diffstat (limited to 'arch/powerpc/kernel/paca.c')
0 files changed, 0 insertions, 0 deletions