From: James Morris <james.l.morris@oracle.com>
Date: Mon, 22 Feb 2016 02:27:12 +0000 (+1100)
Subject: Merge branch 'smack-for-4.6' of https://github.com/cschaufler/smack-next into next
X-Git-Tag: v4.6-rc1~127^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=602094428090ea17321afcb5edc572544b7ee368;p=linux.git

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

602094428090ea17321afcb5edc572544b7ee368