From: James Morris <james.l.morris@oracle.com>
Date: Fri, 8 Jul 2016 00:41:15 +0000 (+1000)
Subject: Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next
X-Git-Tag: v4.8-rc1~95^2~33
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=c632809953fbde9e74394eae2de9d1f5e60ac427

Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next
---

c632809953fbde9e74394eae2de9d1f5e60ac427