From: Tony Lindgren <tony@atomide.com>
Date: Mon, 25 Jun 2012 14:55:17 +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=e2c7cc8032c776335601fa98d014dce511b39133;p=pandora-kernel.git

Merge branch 'cleanup-hwmod' into tmp-merge

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

e2c7cc8032c776335601fa98d014dce511b39133
Reading git-diff-tree failed