]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:12:02 +0000 (13:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 03:12:02 +0000 (13:12 +1000)
1  2 
arch/powerpc/kernel/prom_init.c
security/yama/yama_lsm.c

Simple merge
Simple merge