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: firefly_0821_release~176^2~3110^2~20^2~55
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=155b2fd3d6862509ccb356ff20fff8115d36eedb;p=firefly-linux-kernel-4.4.55.git

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

155b2fd3d6862509ccb356ff20fff8115d36eedb