From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 22 Oct 2006 01:17:05 +0000 (+0100)
Subject: Merge git://git.infradead.org/~dwmw2/cafe-2.6
X-Git-Tag: v2.6.20-rc6~47^2~37^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c45aa055c32b488fc3fd73c760df372b09acf69a;p=pandora-kernel.git

Merge git://git.infradead.org/~dwmw2/cafe-2.6

Conflicts:

	drivers/mtd/nand/Kconfig
---

c45aa055c32b488fc3fd73c760df372b09acf69a
Reading git-diff-tree failed