From: Shawn Guo <shawn.guo@freescale.com>
Date: Tue, 16 Sep 2014 02:24:58 +0000 (+0800)
Subject: Merge branch 'imx/soc' into imx/dt
X-Git-Tag: v3.18-rc1~119^2~20^2~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=155b2fd3d6862509ccb356ff20fff8115d36eedb;p=thirdparty%2Fkernel%2Flinux.git

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

155b2fd3d6862509ccb356ff20fff8115d36eedb