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)
commit2fd4e6698f0863f47558e63b67c7c3a026513541
tree4401d5b14ec8b0d76e53ab04f20cd77f2456efa5
parentfab71a90eddaf4d5f654fdd0ea7c46315c8da4a4
parentec554fa75ec94dcf47e52db9551755679c10235b
Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next
security/smack/smack_lsm.c