From: Shawn Guo <shawn.guo@linaro.org>
Date: Tue, 10 Dec 2013 14:32:50 +0000 (+0800)
Subject: Merge branches 'imx/soc' and 'imx/dt' into for-next
X-Git-Tag: next-20131212~96^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d8da618d5273d4c44e78fd683be67bd69849fe82;p=karo-tx-linux.git

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

d8da618d5273d4c44e78fd683be67bd69849fe82