From: Tony Lindgren <tony@atomide.com>
Date: Tue, 4 Oct 2011 21:08:10 +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=9496a7d66e4908ecb6d9141fe6dec82ba4b665ea;p=pandora-kernel.git

Merge branch 'testing-misc' into dt-merge

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

9496a7d66e4908ecb6d9141fe6dec82ba4b665ea
Reading git-diff-tree failed