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

Merge for-next

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

5498ee1c038ea5ffc5240166d625a1e6aa15cbf8
Reading git-diff-tree failed