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-Url: https://git.stricted.de/?a=commitdiff_plain;h=4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

4f9a60f5c7e74f3e413a1ede1e8b959d01df4e57