Merge branch 'cubox-i-init' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 28 Jan 2014 21:38:58 +0000 (21:38 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 28 Jan 2014 21:38:58 +0000 (21:38 +0000)
commit5efa906486b14c607dd981504fd21b05b867ea1f
treee852f07a4ef5959a5ce7664a8d93bedfc79db4a8
parentf5137a45c20713f06535b7d952b72b673c27488f
parent971488f1149f09fd2fad0e7973780b752809b9f6
Merge branch 'cubox-i-init' into for-linus
arch/arm/boot/dts/Makefile
arch/arm/mach-imx/mach-imx6q.c