From: Tony Lindgren <tony@atomide.com>
Date: Tue, 4 Oct 2011 00:01:39 +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=5a3751c403bb997c234072b576eda5db4e38a64e;p=pandora-kernel.git

Merge branch 'testing-misc' into dt-merge

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

5a3751c403bb997c234072b576eda5db4e38a64e
Reading git-diff-tree failed