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: v3.7-rc1~130^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3585e96cd1049682b8a19a0b699422156e9d735b;p=thirdparty%2Fkernel%2Flinux.git

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

Requested by Casey.
---

3585e96cd1049682b8a19a0b699422156e9d735b