Merge branch 'cleanup-hwmod' into cleanup
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000 (05:47 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000 (05:47 -0700)
commit472fd5401561f94698f4c8f9dbbbfbf76ab55626
tree2b026da522975ca03bfcdd80b66bb266ed6553a9
parent5f6129675bf17aeda5385830c446b91899cb6812
parent19f3a98d82cabdff5a1a437811d472ef52f34954
Merge branch 'cleanup-hwmod' into cleanup

Conflicts:
arch/arm/mach-omap2/dsp.c
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/dsp.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c