Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (63 commits)
  mtd: OneNAND: Allow setting of boundary information when built as module
  jffs2: leaking jffs2_summary in function jffs2_scan_medium
  mtd: nand: Fix memory leak on txx9ndfmc probe failure.
  mtd: orion_nand: use burst reads with double word accesses
  mtd/nand: s3c6400 support for s3c2410 driver
  [MTD] [NAND] S3C2410: Use DIV_ROUND_UP
  [MTD] [NAND] S3C2410: Deal with unaligned lengths in S3C2440 buffer read/write
  [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND
  [MTD] [NAND] S3C2410: Added a kerneldoc for s3c2410_nand_set
  mtd: physmap_of: Add multiple regions and concatenation support
  mtd: nand: max_retries off by one in mxc_nand
  mtd: nand: s3c2410_nand_setrate(): use correct macros for 2412/2440
  mtd: onenand: add bbt_wait & unlock_all as replaceable for some platform
  mtd: Flex-OneNAND support
  mtd: nand: add OMAP2/OMAP3 NAND driver
  mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs
  mtd: uclinux: mark local stuff static
  mtd: uclinux: do not allow to be built as a module
  mtd: uclinux: allow systems to override map addr/size
  mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs
  ...

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index cc6369ea67dd..59c46126a5ce 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -500,6 +500,9 @@ static struct flash_info __devinitdata m25p_data [] = {
         { "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, },
         { "at26df321",  0x1f4701, 0, 64 * 1024, 64, SECT_4K, },
 
+        /* Macronix */
+        { "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
+
         /* Spansion -- single (large) sector size only, at least
          * for the chips listed here (without boot sectors).
          */
@@ -528,6 +531,7 @@ static struct flash_info __devinitdata m25p_data [] = {
         { "m25p64",  0x202017,  0, 64 * 1024, 128, },
         { "m25p128", 0x202018, 0, 256 * 1024, 64, },
 
+        { "m45pe10", 0x204011,  0, 64 * 1024, 2, },
         { "m45pe80", 0x204014,  0, 64 * 1024, 16, },
         { "m45pe16", 0x204015,  0, 64 * 1024, 32, },