Merge branch 'omap/headers4' into next/cleanup

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/clock33xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge

diff --cc arch/arm/mach-omap2/serial.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge

diff --cc drivers/staging/tidspbridge/include/dspbridge/host_os.h
Simple merge

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge