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

Conflicts:
	drivers/mtd/Makefile

diff --cc drivers/mtd/Kconfig
Simple merge

diff --cc drivers/mtd/Makefile
index 7fb3dfbb45793bc77649d3dd6ecb72cbcced4502,40d304d6191d16d5be5c69b0b62ddbf99a1dc759..4521b1ecce452607987b3d32c6251264de02d2b8
--- 1/drivers/mtd/Makefile
--- 2/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/