From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 10 May 2010 13:32:46 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.35-rc1~465^2~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ae28a35bcb7984838acbf28bfba9c030f8b74f0;p=pandora-kernel.git

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

Conflicts:
	drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
---

0ae28a35bcb7984838acbf28bfba9c030f8b74f0
Reading git-diff-tree failed