]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)
1  2 
arch/arm/Kconfig
arch/arm/Makefile

Simple merge
Simple merge