Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Wed, 8 Jan 2014 06:22:32 +0000 (17:22 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 8 Jan 2014 06:22:32 +0000 (17:22 +1100)
commit923b49ff69fcbffe6f8b2739de218c45544392a7
tree44d03d61cad1edd916e5e0d88641353aa7cd0d4c
parentd4a82a4a033d563f1dc2c944eec2358cb38432d0
parent8ed814602876bec9bad2649ca17f34b499357a1c
Merge branch 'master' of git://git.infradead.org/users/pcmoore/selinux into next