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)
commitb1f71bd0328a8c928258d3c8be689ddbc13a8a3b
treeed0f0b21ed9ab96a1bfca107cbe37e0692d12d4e
parent591d07bf13a009315340d4b65c7ffef6aaed6bca
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815
Merge branch 'omap/headers4' into next/dt

These changes are needed for the following omap DT changes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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