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

Merge branch 'fixes' into tmp-merge

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

d742972597a8fdc3533af992180fe990e9ab03c5
Reading git-diff-tree failed