From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Mar 2012 22:22:01 +0000 (-0800)
Subject: Merge branch 'fixes' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed1dc58250735aafa280cb5f603d80bb70121777;p=pandora-kernel.git

Merge branch 'fixes' into tmp-merge

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

ed1dc58250735aafa280cb5f603d80bb70121777
Reading git-diff-tree failed