Merge commit 'v3.15' into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 24 Jun 2014 08:46:07 +0000 (18:46 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 24 Jun 2014 08:46:07 +0000 (18:46 +1000)
commitf01387d2693813eb5271a3448e6a082322c7d75d
treeb591ca73c85276bae53d7db57ff1565be45a29da
parent92953ff38ba59b4f7b1a54ab28b84be35fafaecc
parent1860e379875dfe7271c649058aeddffe5afd9d0d
Merge commit 'v3.15' into next
Documentation/security/Smack.txt
include/linux/security.h
security/security.c
security/selinux/hooks.c