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://pilppa.com/gitweb/?a=commitdiff_plain;h=572acc41274522b865440d0644d5f986e3c83755;p=linux-2.6-omap-h63xx.git

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

Conflicts:
	drivers/mtd/Makefile
---

572acc41274522b865440d0644d5f986e3c83755
diff --cc drivers/mtd/Makefile
index 7fb3dfbb457,40d304d6191..4521b1ecce4
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@@ -29,6 -29,6 +29,6 @@@ obj-$(CONFIG_MTD_OOPS)		+= mtdoops.
  nftl-objs		:= nftlcore.o nftlmount.o
  inftl-objs		:= inftlcore.o inftlmount.o
  
- obj-y		+= chips/ lpddr/ maps/ devices/ nand/ onenand/ 
 -obj-y		+= chips/ maps/ devices/ nand/ onenand/ tests/
++obj-y		+= chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/
  
  obj-$(CONFIG_MTD_UBI)		+= ubi/