Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine_common_...
authorPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)
committerPaul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)
1  2  3  4  5  6 
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/plat-omap/include/plat/omap_hwmod.h

Simple merge