From: Tony Lindgren <tony@atomide.com>
Date: Mon, 20 Sep 2010 22:14:16 +0000 (-0700)
Subject: Merge for-next
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96542e6e9d6f3d32bf95bf1ff50f4632aa5e57b5;p=pandora-kernel.git

Merge for-next

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

96542e6e9d6f3d32bf95bf1ff50f4632aa5e57b5
Reading git-diff-tree failed