Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <[email protected]>
Thu, 4 Dec 2014 21:49:14 +0000 (08:49 +1100)
committerJames Morris <[email protected]>
Thu, 4 Dec 2014 21:49:14 +0000 (08:49 +1100)

Trivial merge