From: Tony Lindgren <tony@atomide.com>
Date: Tue, 4 Oct 2011 16:19:29 +0000 (-0700)
Subject: Merge branch 'testing-misc' into dt-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e02ab58670691e602c36cf3d6a24a5ae61e64c8b;p=pandora-kernel.git

Merge branch 'testing-misc' into dt-merge

Conflicts:
	arch/arm/mach-omap2/board-generic.c
---

e02ab58670691e602c36cf3d6a24a5ae61e64c8b
Reading git-diff-tree failed