]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 14 Aug 2015 07:35:10 +0000 (17:35 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 14 Aug 2015 07:35:10 +0000 (17:35 +1000)

Trivial merge