From: Shawn Guo <shawn.guo@linaro.org>
Date: Tue, 13 Jan 2015 11:17:50 +0000 (+0800)
Subject: Merge branch 'imx/soc' into imx/dt
X-Git-Tag: firefly_0821_release~176^2~2307^2~19^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5d15798be78374156b40b74f3484ad4fabb45775;p=firefly-linux-kernel-4.4.55.git

Merge branch 'imx/soc' into imx/dt
---

5d15798be78374156b40b74f3484ad4fabb45775