Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for...
authorTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 22:54:17 +0000 (14:54 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 9 Nov 2012 22:54:17 +0000 (14:54 -0800)
commitf56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37
treea9ce4f46ea3b2e516698b2c3817e40414a8bbf51
parent84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3
parent6ba54ab4a49bbad736b0254aa6bdf0cb83013815
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt

Conflicts:
arch/arm/plat-omap/dmtimer.c

Resolved as suggested by Jon Hunter.
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
arch/arm/mach-omap2/timer.c
arch/arm/plat-omap/dmtimer.c
arch/arm/plat-omap/include/plat/dmtimer.h
drivers/staging/tidspbridge/include/dspbridge/host_os.h
drivers/usb/musb/musb_dsps.c