git.kernel.dk Git - linux-2.6-block.git/commit - arch/arm/mach-omap2/omap

author	Paul Walmsley <paul@pwsan.com>
	Thu, 21 Jun 2012 02:11:36 +0000 (20:11 -0600)
committer	Paul Walmsley <paul@pwsan.com>
	Thu, 21 Jun 2012 02:11:36 +0000 (20:11 -0600)
commit	07b3a13957aa250ff5b5409b8ed756b113544112
tree	86fc625aa9cd9fb2817b88a3793d557a103444e4	tree \| snapshot
parent	d44f42e6af483cbdc239d7f28666e711d2e8ab92	commit \| diff
parent	3d3635c4d77a97c61a539dff86f9a4b67134b4cb	commit \| diff
parent	0a179eaa436e58ed9fd00e09cdf01f1b3604d9a1	commit \| diff
parent	7039154bb218e06cc876a008cdf57f3fbc00c25e	commit \| diff
parent	868c157df9721675c19729eed2c96bac6c3f1d01	commit \| diff

Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3.6', 'hwmod_soc_conditional_cleanup_3.6', 'mcbsp_clock_aliases_cleanup_3.6' and 'remove_clkdm_requirement_from_hwmod_3.6' into omap_cleanup_a_3.6

Conflicts:
arch/arm/mach-omap2/omap_hwmod.c

arch/arm/mach-omap2/omap_hwmod.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_2420_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_2430_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_44xx_data.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history