From: Shawn Guo <shawn.guo@linaro.org>
Date: Wed, 18 Dec 2013 06:42:05 +0000 (+0800)
Subject: Merge branches 'imx/soc' and 'imx/dt' into for-next
X-Git-Tag: next-20131220~106^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9cf991173ce5873961b7286f3ee1a1bcf4141bd1;p=karo-tx-linux.git

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

9cf991173ce5873961b7286f3ee1a1bcf4141bd1