From: Tony Lindgren <tony@atomide.com>
Date: Thu, 6 Oct 2011 02:08:47 +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=d9e9dbd29ed0d31554b54b96753463c42f3a76eb;p=pandora-kernel.git

Merge branch 'testing-misc' into dt-merge

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

d9e9dbd29ed0d31554b54b96753463c42f3a76eb
Reading git-diff-tree failed