Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:11:13 +0000 (16:11 +1100)
committerJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:11:13 +0000 (16:11 +1100)
commitaa98b942cbf305cf2abe5dc3aff11f579c7d7fdc
tree0fe979dc49a794ae50af585062e75ebcf8427900
parent37babe4ec610ff288a60aa79619b3d2f00bcfd89
parent81bd0d56298f93af6ac233d8a7e8b29aa4b094b7
Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next
security/smack/smack_lsm.c