Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Mon, 26 May 2014 12:38:46 +0000 (22:38 +1000)
committerJames Morris <james.l.morris@oracle.com>
Mon, 26 May 2014 12:38:46 +0000 (22:38 +1000)
commit92953ff38ba59b4f7b1a54ab28b84be35fafaecc
tree235ddd61f28c3030838ebbe5655fccfd1468042c
parent2fd4e6698f0863f47558e63b67c7c3a026513541
parent47dd0b76ace953bd2c0479076db0d3e3b9594003
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
security/selinux/hooks.c