]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'selinux/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:01:01 +0000 (12:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:01:01 +0000 (12:01 +1000)
1  2 
net/xfrm/xfrm_policy.c
security/selinux/selinuxfs.c

Simple merge
Simple merge