From: Tony Lindgren <tony@atomide.com>
Date: Tue, 3 Apr 2012 17:20:06 +0000 (-0700)
Subject: Merge branch 'hwmod' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b71502263ecd9bd76336044d46f63d77275b4262;p=pandora-kernel.git

Merge branch 'hwmod' into tmp-merge

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

b71502263ecd9bd76336044d46f63d77275b4262
Reading git-diff-tree failed