From: Tony Lindgren <tony@atomide.com>
Date: Wed, 7 Jul 2010 12:40:09 +0000 (+0300)
Subject: Merge omap-testing
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=796978cb43ee9af4d6d34c6d1df94672c945e885;p=pandora-kernel.git

Merge omap-testing

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

796978cb43ee9af4d6d34c6d1df94672c945e885
Reading git-diff-tree failed