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

Merge for-next

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

e8f72fad2745cbcfd6bc620da3e4847c7b48188f
Reading git-diff-tree failed