From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sun, 20 Sep 2009 12:55:36 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.32-rc1~160^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6469f540ea37d53db089c8fea9c0c77a3d9353d4;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
	drivers/mtd/mtdcore.c

Merged in order that I can apply the Nomadik nand/onenand support patches.
---

6469f540ea37d53db089c8fea9c0c77a3d9353d4
Reading git-diff-tree failed