projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5137a4 971488f)
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)
1  2 
arch/arm/boot/dts/Makefile patch | diff1 | diff2 | blob | history
arch/arm/mach-imx/mach-imx6q.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/boot/dts/Makefile
Simple merge
diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules