Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into ra-next
authorJames Morris <james.l.morris@oracle.com>
Tue, 22 Oct 2013 11:26:41 +0000 (22:26 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 22 Oct 2013 11:26:41 +0000 (22:26 +1100)

Trivial merge