From: James Morris <james.l.morris@oracle.com>
Date: Wed, 26 Nov 2014 13:35:32 +0000 (+1100)
Subject: Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next
X-Git-Tag: firefly_0821_release~176^2~2675^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ac14ae25b676d721b6bfcfb046dc53a9f7760d83;p=firefly-linux-kernel-4.4.55.git

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

ac14ae25b676d721b6bfcfb046dc53a9f7760d83