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: fixes-v4.0-rc1~86^2~19^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d15798be78374156b40b74f3484ad4fabb45775;p=pandora-kernel.git

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

5d15798be78374156b40b74f3484ad4fabb45775