Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into...

author Russell King <[email protected]>

Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)

committer Russell King <[email protected]>

Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)
author Russell King <[email protected]>
Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)
committer Russell King <[email protected]>
Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Russell King <[email protected]>
	Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)
committer	Russell King <[email protected]>
	Thu, 29 Jul 2010 14:48:02 +0000 (15:48 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history