Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next

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