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

Simple merge
Simple merge