Merge branch 'omap4' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 28 May 2009 22:45:14 +0000 (15:45 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 May 2009 22:45:14 +0000 (15:45 -0700)
commitcd07ecc828486e5887113c7dc4d9f9022145811b
treef3950d6077a794d4500244b2f372c6912af15eec
parent4c50d22a0cf240918d53afbf9a8416a9d93aacee
parentb04e8975e70d9b2bc27c017f92b356b312692544
Merge branch 'omap4' into for-next
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/serial.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/clock.c
arch/arm/plat-omap/common.c
arch/arm/plat-omap/include/mach/clock.h
arch/arm/plat-omap/include/mach/common.h
arch/arm/plat-omap/include/mach/control.h
arch/arm/plat-omap/include/mach/irqs.h
arch/arm/plat-omap/include/mach/serial.h
arch/arm/plat-omap/sram.c