From: Tony Lindgren <tony@atomide.com>
Date: Wed, 27 Jun 2012 15:23:25 +0000 (-0700)
Subject: Merge branch 'cleanup-hwmod' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712225a26a0979c2372fbba9484ccb819ed2d97f;p=pandora-kernel.git

Merge branch 'cleanup-hwmod' into tmp-merge

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

712225a26a0979c2372fbba9484ccb819ed2d97f
Reading git-diff-tree failed