From: James Morris <james.l.morris@oracle.com>
Date: Thu, 27 Sep 2012 01:03:40 +0000 (+1000)
Subject: Merge branch 'for-1209' of git://gitorious.org/smack-next/kernel into next
X-Git-Tag: firefly_0821_release~3680^2~627^2~61
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3585e96cd1049682b8a19a0b699422156e9d735b;p=firefly-linux-kernel-4.4.55.git

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

Requested by Casey.
---

3585e96cd1049682b8a19a0b699422156e9d735b