Merge branch 'stable-3.18' of git://git.infradead.org/users/pcmoore/selinux into for-linus