tree cd71baff2cdd908bd4a5243f65f6b739a653d919
parent 9c1db7798141e2658e4b5bb170128dfdc3270ff4
parent 2172fa709ab32ca60e86179dc67d0857be8e2c98
author James Morris <james.l.morris@oracle.com> 1391993301 +1100
committer James Morris <james.l.morris@oracle.com> 1391993301 +1100

Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into for-linus