From: Tony Lindgren <tony@atomide.com>
Date: Fri, 2 Jul 2010 10:39:42 +0000 (+0300)
Subject: Merge omap-testing
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3df6517c693e7053960bc7d7944035cdb2bfb0c;p=pandora-kernel.git

Merge omap-testing

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

b3df6517c693e7053960bc7d7944035cdb2bfb0c
Reading git-diff-tree failed