Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 8 Jul 2016 00:41:15 +0000 (10:41 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 8 Jul 2016 00:41:15 +0000 (10:41 +1000)
commitc632809953fbde9e74394eae2de9d1f5e60ac427
tree16103b63b53545315b0cade9e73551c6a79f661a
parentf6041c1d8a0825e41219a0443d365318d238d7b3
parentece38248cfca9d1b0ba183c923f0acd2e0bf6316
Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next
security/smack/smack_lsm.c