Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...
authorJames Morris <james.l.morris@oracle.com>
Fri, 27 Mar 2015 09:33:27 +0000 (20:33 +1100)
committerJames Morris <james.l.morris@oracle.com>
Fri, 27 Mar 2015 09:33:27 +0000 (20:33 +1100)
commit641628146c1986c966ae030e65bb6f30feef0fd0
treef26a935d0760d20b4f5cdaefbc4c6e2a49e62a94
parent3c435c1e472ba344ee25f795f4807d4457e61f6c
parent6436a123a147db51a0b06024a8350f4c230e73ff
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus
security/selinux/selinuxfs.c