Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 20 May 2014 04:50:09 +0000 (14:50 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 20 May 2014 04:50:09 +0000 (14:50 +1000)
1  2 
security/smack/smack_lsm.c

Simple merge