From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 Jun 2012 12:47:01 +0000 (-0700)
Subject: Merge branch 'cleanup-hwmod' into cleanup
X-Git-Tag: omap-cleanup-for-v3.6^0
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=472fd5401561f94698f4c8f9dbbbfbf76ab55626;p=pandora-kernel.git

Merge branch 'cleanup-hwmod' into cleanup

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

472fd5401561f94698f4c8f9dbbbfbf76ab55626
Reading git-diff-tree failed