Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

author Russell King <rmk@dyn-67.arm.linux.org.uk>

Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 29 May 2009 09:04:24 +0000 (10:04 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h	patch \|	diff1 \|	diff2 \|	blob \| history