Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra...
authorJames Morris <james.l.morris@oracle.com>
Thu, 22 Aug 2013 16:50:12 +0000 (02:50 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 22 Aug 2013 16:50:12 +0000 (02:50 +1000)
1  2 
security/smack/smack_lsm.c

Simple merge