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

author Shawn Guo <shawn.guo@linaro.org>

Wed, 18 Dec 2013 06:42:05 +0000 (14:42 +0800)

committer Shawn Guo <shawn.guo@linaro.org>

Wed, 18 Dec 2013 06:42:05 +0000 (14:42 +0800)
author Shawn Guo <shawn.guo@linaro.org>
Wed, 18 Dec 2013 06:42:05 +0000 (14:42 +0800)
committer Shawn Guo <shawn.guo@linaro.org>
Wed, 18 Dec 2013 06:42:05 +0000 (14:42 +0800)
diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge
author	Shawn Guo <shawn.guo@linaro.org>
	Wed, 18 Dec 2013 06:42:05 +0000 (14:42 +0800)
committer	Shawn Guo <shawn.guo@linaro.org>
	Wed, 18 Dec 2013 06:42:05 +0000 (14:42 +0800)