Merge branches 'omap1-upstream' and 'omap2-upstream' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 12 Oct 2007 22:44:30 +0000 (23:44 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Oct 2007 22:44:35 +0000 (23:44 +0100)
1  2  3 
include/asm-arm/arch-omap/hardware.h

Simple merge