Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...
authorJames Morris <james.l.morris@oracle.com>
Thu, 26 Nov 2015 04:04:19 +0000 (15:04 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 26 Nov 2015 04:04:19 +0000 (15:04 +1100)
commit6e37592900f1e75c2031ec10886f4858a260aeec
tree6835898fc94ddcf1988e539da0270657739c836a
parent096fe9eaea40a17e125569f9e657e34cdb6d73bd
parentf3bef67992e8698897b584616535803887c4a73e
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2