From: James Morris <james.l.morris@oracle.com>
Date: Tue, 20 May 2014 04:50:09 +0000 (+1000)
Subject: Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2fd4e6698f0863f47558e63b67c7c3a026513541;p=linux.git

Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next
---

2fd4e6698f0863f47558e63b67c7c3a026513541