Merge commit 'v3.15' into next

diff --cc Documentation/security/Smack.txt
Simple merge

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

diff --cc security/security.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge