From: Shawn Guo <shawn.guo@linaro.org>
Date: Sat, 14 Dec 2013 14:13:53 +0000 (+0800)
Subject: Merge branches 'imx/soc' and 'imx/dt' into for-next
X-Git-Tag: next-20131220~106^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=503139b137ae15a023e741668f446ef8c5902052;p=karo-tx-linux.git

Merge branches 'imx/soc' and 'imx/dt' into for-next
---

503139b137ae15a023e741668f446ef8c5902052