Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:35:01 +0000 (08:35 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 18 Apr 2017 22:35:01 +0000 (08:35 +1000)
commit6859e21e816d8c97a0f3af6162d5ada145e6821d
tree5ceacb2ce2194d67c0614f9b72ebbc6739fb76cc
parentfa5b5b26e25cbab819e0955f948e8a6d5363f06f
parentaf96f0d6394a0af59c4dd71d6bcd3b1ddfba5196
Merge branch 'smack-for-4.12' of git://github.com/cschaufler/smack-next into next