Merge branches 'omap1-upstream' and 'omap2-upstream' into devel

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

Fri, 12 Oct 2007 22:44:30 +0000 (23:44 +0100)

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

Fri, 12 Oct 2007 22:44:35 +0000 (23:44 +0100)
author Russell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 12 Oct 2007 22:44:30 +0000 (23:44 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Oct 2007 22:44:35 +0000 (23:44 +0100)
diff --cc include/asm-arm/arch-omap/hardware.h
Simple merge
author	Russell King <rmk@dyn-67.arm.linux.org.uk>
	Fri, 12 Oct 2007 22:44:30 +0000 (23:44 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Fri, 12 Oct 2007 22:44:35 +0000 (23:44 +0100)