]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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
arch/arm/mach-imx/mach-imx6q.c

Simple merge
Simple merge