From: Tony Lindgren <tony@atomide.com>
Date: Tue, 28 Sep 2010 00:18:44 +0000 (-0700)
Subject: Merge for-next
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5824633f9ddb4370d2824a3a7cb5ea20d764d12f;p=pandora-kernel.git

Merge for-next

Conflicts:
	arch/arm/configs/n8x0_defconfig
---

5824633f9ddb4370d2824a3a7cb5ea20d764d12f
Reading git-diff-tree failed