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

Merge for-next

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

e38df54473446ebb9bfa5f3c7ded45f427d69206
Reading git-diff-tree failed