]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'selinux/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:26:46 +0000 (14:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:26:46 +0000 (14:26 +1100)
commit45ffb5e1037205b5f3ecede38bfe9b4cc257ace4
tree79e0d0db290177d2a177d290fcbad25473cd74af
parenta754a67fd42420198bfba424db321e7f0f82c9e6
parent465954cd649a7d8cd331695bd24a16bcb5c4c716
Merge remote-tracking branch 'selinux/master'

Conflicts:
security/selinux/hooks.c
security/selinux/hooks.c