From: Paul Walmsley <paul@pwsan.com>
Date: Thu, 21 Jun 2012 02:11:36 +0000 (-0600)
Subject: Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3... 
X-Git-Tag: omap-cleanup-for-v3.6^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07b3a13957aa250ff5b5409b8ed756b113544112;p=pandora-kernel.git

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
---

07b3a13957aa250ff5b5409b8ed756b113544112
Reading git-diff-tree failed