Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel...

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

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

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

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

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

diff --cc arch/arm/mach-omap2/clockdomain.h
Simple merge

diff --cc arch/arm/mach-omap2/control.h
Simple merge

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

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

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

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