From: James Morris <jmorris@namei.org>
Date: Fri, 18 Nov 2011 00:17:06 +0000 (+1100)
Subject: Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus
X-Git-Tag: firefly_0821_release~3680^2~4089^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe8a0df46e5076429872887b467c538bc9c0c738;p=firefly-linux-kernel-4.4.55.git

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

fe8a0df46e5076429872887b467c538bc9c0c738