Merge branch 'stable-3.17' of git://git.infradead.org/users/pcmoore/selinux