From: James Morris <james.l.morris@oracle.com>
Date: Thu, 22 Aug 2013 16:50:12 +0000 (+1000)
Subject: Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel into ra... 
X-Git-Tag: firefly_0821_release~176^2~5395^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=73203361468894c3c017bfbdd9ddcbb468039604;p=firefly-linux-kernel-4.4.55.git

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

73203361468894c3c017bfbdd9ddcbb468039604