From: Tony Lindgren <tony@atomide.com>
Date: Tue, 3 Aug 2010 09:18:22 +0000 (+0300)
Subject: Merge omap-testing
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62512135bafabc2432ea8d674a7d5452c4686a3a;p=pandora-kernel.git

Merge omap-testing

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

62512135bafabc2432ea8d674a7d5452c4686a3a
Reading git-diff-tree failed