Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Sat, 2 Aug 2014 12:58:02 +0000 (22:58 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 2 Aug 2014 12:58:02 +0000 (22:58 +1000)
commit103ae675b12dee75ec099abf3d22857d1384b3bc
treea6b4f71bc911e7283b6573ee5833cd36a3ac2469
parenta3d64df849bcb84220bf6db5773a10eee1fad4dc
parent4fbe63d1c773cceef3fe1f6ed0c9c268f4f24760
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
security/smack/smack_access.c
security/smack/smack_lsm.c
security/smack/smackfs.c