From: James Morris <james.l.morris@oracle.com>
Date: Thu, 22 Jan 2015 02:22:23 +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=9d5a5f65fcabb876cb0092901d56627bd5cbfc44;p=openwrt%2Fstaging%2Fblogic.git

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

9d5a5f65fcabb876cb0092901d56627bd5cbfc44