From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 5 Jan 2009 16:24:55 +0000 (+0000)
Subject: Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
X-Git-Tag: v2.6.29-rc1~33^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=572acc41274522b865440d0644d5f986e3c83755;p=pandora-kernel.git

Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6

Conflicts:
	drivers/mtd/Makefile
---

572acc41274522b865440d0644d5f986e3c83755
Reading git-diff-tree failed