Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 26 Jan 2017 22:23:21 +0000 (09:23 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 26 Jan 2017 22:23:21 +0000 (09:23 +1100)
commit710584b9daefe25a2b5dc2c6c10dbb00e1b3b451
tree009861b1deb7839b99ca3c39de98e85b943da3f4
parentc659af78eb7b7d7be40f23d9d97bde58eb1368ac
parent83a1e53f392075e291a90746241dce45c6f9429a
Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next
security/smack/smack_lsm.c