From: James Morris <james.l.morris@oracle.com>
Date: Tue, 20 Oct 2015 23:49:29 +0000 (+1100)
Subject: Merge branch 'smack-for-4.4' of https://github.com/cschaufler/smack-next into next
X-Git-Tag: v4.4-rc1~107^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=09302fd19efbff9569eaad3f78ead8f411defd87;p=users%2Fdwmw2%2Flinux.git

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

09302fd19efbff9569eaad3f78ead8f411defd87