]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'selinux/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:35:00 +0000 (12:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:35:00 +0000 (12:35 +1000)
commit8eac5810dee4eaed8f5b729214e7a63c130b3595
tree587d0db98554ad0938d91f076171b952e6f56a21
parent12b55fdddbe47a104b5c1b335aa6f5c6c7bcb69a
parentc737f8284cac91428f8fcc8281e69117fa16e887
Merge remote-tracking branch 'selinux/master'
include/linux/security.h
security/selinux/hooks.c
security/smack/smack_lsm.c