Merge branches 'dmtimer_precleanup_3.1', 'hwmod_core_cleanup_a_3.1', 'combine_common_...

author Paul Walmsley <paul@pwsan.com>

Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)

committer Paul Walmsley <paul@pwsan.com>

Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)
author Paul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)
committer Paul Walmsley <paul@pwsan.com>
Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)
diff --cc arch/arm/mach-omap2/omap_hwmod.c
Simple merge
diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge
diff --cc arch/arm/plat-omap/include/plat/omap_hwmod.h
Simple merge
author	Paul Walmsley <paul@pwsan.com>
	Sun, 10 Jul 2011 02:24:07 +0000 (20:24 -0600)
committer	Paul 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	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
arch/arm/plat-omap/include/plat/omap_hwmod.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history