Merge tag 'v3.16' into next

Linux 3.16

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

diff --cc security/smack/smack_access.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge

diff --cc security/smack/smackfs.c
Simple merge