Merge branch 'omap/headers4' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:09:41 +0000 (17:09 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 15 Nov 2012 16:09:41 +0000 (17:09 +0100)
These changes are needed for the following omap DT changes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/Kconfig
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/mach-omap2/serial.c
drivers/staging/tidspbridge/include/dspbridge/host_os.h
drivers/usb/musb/musb_dsps.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge