From: James Morris <james.l.morris@oracle.com>
Date: Thu, 29 Jan 2015 00:01:07 +0000 (+1100)
Subject: Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=90200f19160734feceb92a3a054864c340242699;p=openwrt%2Fstaging%2Fblogic.git

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

90200f19160734feceb92a3a054864c340242699