From: James Morris <james.l.morris@oracle.com>
Date: Thu, 2 Apr 2015 00:03:58 +0000 (+1100)
Subject: Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next
X-Git-Tag: v4.1-rc1~126^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'smack-for-4.1' of git://github.com/cschaufler/smack-next into next
---

4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57