From: James Morris <james.l.morris@oracle.com>
Date: Wed, 3 Jun 2015 09:10:29 +0000 (+1000)
Subject: Merge branch 'smack-for-4.2-stacked' of https://github.com/cschaufler/smack-next... 
X-Git-Tag: v4.2-rc1~77^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6e29a4eae335059d2cc44ac543de7556ff7ac09;p=thirdparty%2Fkernel%2Flinux.git

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

e6e29a4eae335059d2cc44ac543de7556ff7ac09