]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Mon, 22 Feb 2016 02:27:12 +0000 (13:27 +1100)
committerJames Morris <james.l.morris@oracle.com>
Mon, 22 Feb 2016 02:27:12 +0000 (13:27 +1100)
commit602094428090ea17321afcb5edc572544b7ee368
tree8e4a100bd104851c1ec96b58f0be022fae87fdfa
parent99cda8cb4639de81cde785b5bab9bc52e916e594
parent8012495e177bbf67eba8915e266a6f897bedbd53
Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next