From: Tony Lindgren <tony@atomide.com>
Date: Tue, 6 Jul 2010 14:06:44 +0000 (+0300)
Subject: Merge omap-testing
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1af36e55c1fb64f35bca60b114ba1a269f3264d9;p=pandora-kernel.git

Merge omap-testing

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

1af36e55c1fb64f35bca60b114ba1a269f3264d9
Reading git-diff-tree failed