Merge remote-tracking branch 'security/next'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/powerpc/kernel/prom_init.c
Simple merge

diff --cc fs/file_table.c
Simple merge

diff --cc fs/xattr.c
Simple merge

diff --cc include/linux/audit.h
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc include/linux/xattr.h
Simple merge

diff --cc security/yama/yama_lsm.c
Simple merge