Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel...
authorTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:29:31 +0000 (00:29 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:29:31 +0000 (00:29 -0700)
commit3f96a2d90e6923e2dd1e35d2f149a70a4d0f678c
treea10372c71503f2ee6e4cdfef42357dce8b620e02
parent6887a4131da3adaab011613776d865f4bcfb5678
parent472fd5401561f94698f4c8f9dbbbfbf76ab55626
parentc59b537d87068be8c357a0150f6172a2dc8cdf82
parent6fd8246b1c1167c983b089f9eaafa13ef9ca7adf
Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel-am33xx-for-v3.6' into devel-am33xx-part2
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clock2420_data.c
arch/arm/mach-omap2/clock2430_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/clockdomain.h
arch/arm/mach-omap2/control.h
arch/arm/mach-omap2/irq.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