tree 009861b1deb7839b99ca3c39de98e85b943da3f4
parent c659af78eb7b7d7be40f23d9d97bde58eb1368ac
parent 83a1e53f392075e291a90746241dce45c6f9429a
author James Morris <james.l.morris@oracle.com> 1485469401 +1100
committer James Morris <james.l.morris@oracle.com> 1485469401 +1100

Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next