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

Conflicts:
	drivers/mtd/Makefile

diff --combined drivers/mtd/Kconfig
index ad20dc3128b9a13b9f3e32b3bdc97ad8289b3358,8581ed9eafe247bc10c8c05187f36977366e75a8..7d04fb9ddcaae15a2ae260c73697d3a99b1106d1
--- 1/drivers/mtd/Kconfig
--- 2/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@@ -45,6 -45,14 +45,14 @@@ config MTD_PARTITION
          devices. Partitioning on NFTL 'devices' is a different - that's the
          'normal' form of partitioning used on a block device.
  
+ config MTD_TESTS
+       tristate "MTD tests support"
+       depends on m
+       help
+         This option includes various MTD tests into compilation. The tests
+         should normally be compiled as kernel modules. The modules perform
+         various checks and verifications when loaded.
+ 
  config MTD_REDBOOT_PARTS
        tristate "RedBoot partition table parsing"
        depends on MTD_PARTITIONS
@@@ -316,8 -324,6 +324,8 @@@ source "drivers/mtd/nand/Kconfig
  
  source "drivers/mtd/onenand/Kconfig"
  
 +source "drivers/mtd/lpddr/Kconfig"
 +
  source "drivers/mtd/ubi/Kconfig"
  
  endif # MTD

diff --combined 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/