From: David Woodhouse <dwmw2@infradead.org>
Date: Fri, 27 Apr 2007 18:16:19 +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.22-rc1~1116^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1da4e50e5d09f02c340927a4fcb7f54202fa033;p=pandora-kernel.git

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

Conflicts:

	drivers/mtd/Kconfig

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

d1da4e50e5d09f02c340927a4fcb7f54202fa033
Reading git-diff-tree failed