From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sat, 30 Oct 2010 11:35:11 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v2.6.37-rc1~22^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67577927e8d7a1f4b09b4992df640eadc6aacb36;p=pandora-kernel.git

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

Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

67577927e8d7a1f4b09b4992df640eadc6aacb36
Reading git-diff-tree failed