From: James Morris <james.l.morris@oracle.com>
Date: Fri, 14 Aug 2015 07:35:10 +0000 (+1000)
Subject: Merge branch 'smack-for-4.3' of https://github.com/cschaufler/smack-next into next
X-Git-Tag: firefly_0821_release~176^2~1119^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0e38c35815f50e5a347977d76fb5eb4c3bf020b5;p=firefly-linux-kernel-4.4.55.git

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

0e38c35815f50e5a347977d76fb5eb4c3bf020b5