]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:46:18 +0000 (15:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Sep 2012 05:46:18 +0000 (15:46 +1000)
1  2 
Documentation/kernel-parameters.txt
arch/powerpc/kernel/prom_init.c
fs/xattr.c
include/linux/xattr.h
security/yama/yama_lsm.c

Simple merge
Simple merge
diff --cc fs/xattr.c
Simple merge
Simple merge
Simple merge