From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 1 Oct 2006 16:55:53 +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.19-rc1~374^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a84fc15ae5cafcc366dd85cf8e1ab2040679abc;p=pandora-kernel.git

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

Manually resolve conflict in include/mtd/Kbuild

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

8a84fc15ae5cafcc366dd85cf8e1ab2040679abc
Reading git-diff-tree failed