From: Tony Lindgren <tony@atomide.com>
Date: Wed, 4 Aug 2010 15:33:20 +0000 (+0300)
Subject: Merge for-next
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=024a97de33fc7e1138ab1641a2f99f660feae36a;p=pandora-kernel.git

Merge for-next

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

024a97de33fc7e1138ab1641a2f99f660feae36a
Reading git-diff-tree failed