Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_cff3.7_odaf3.7
authorPaul Walmsley <paul@pwsan.com>
Sat, 22 Sep 2012 16:00:11 +0000 (10:00 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sat, 22 Sep 2012 16:00:11 +0000 (10:00 -0600)
These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.

1  2 
arch/arm/mach-omap2/clock33xx_data.c
arch/arm/mach-omap2/omap-wakeupgen.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/timer.c
arch/arm/plat-omap/sram.c
drivers/tty/serial/imx.c
drivers/usb/gadget/u_serial.c
drivers/usb/serial/ftdi_sio.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge