From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 May 2010 14:25:43 +0000 (-0700)
Subject: Merge git://git.infradead.org/mtd-2.6
X-Git-Tag: v2.6.35-rc1~465
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=05ec7dd8dd5aa42c22a49682e4a51cadd4166b7e

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

* git://git.infradead.org/mtd-2.6: (154 commits)
  mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips
  mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID
  mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value
  mtd: update gfp/slab.h includes
  jffs2: Stop triggering block erases from jffs2_write_super()
  jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()
  jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases
  jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held
  jffs2: Wake GC thread when there are blocks to be erased
  jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return
  jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks()
  mtd: mtdchar: Do not corrupt backing device of device node inode
  mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages
  drivers/mtd: Use kmemdup
  mtd: cfi_cmdset_0002: Fix argument order in bootloc warning
  mtd: nand: add Toshiba TC58NVG0 device ID
  pcmciamtd: add another ID
  pcmciamtd: coding style cleanups
  pcmciamtd: fixing obvious errors
  mtd: chips: add SST39WF160x NOR-flashes
  ...

Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c
---

05ec7dd8dd5aa42c22a49682e4a51cadd4166b7e
diff --cc drivers/mtd/maps/pcmciamtd.c
index 87b2b8f,a975f2a..e699e6a
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@@ -646,11 -656,12 +655,10 @@@ static int pcmciamtd_config(struct pcmc
  		pcmciamtd_release(link);
  		return -ENODEV;
  	}
- 	info("mtd%d: %s", mtd->index, mtd->name);
 -	snprintf(dev->node.dev_name, sizeof(dev->node.dev_name), "mtd%d", mtd->index);
+ 	dev_info(&dev->p_dev->dev, "mtd%d: %s\n", mtd->index, mtd->name);
 -	link->dev_node = &dev->node;
  	return 0;
  
-  failed:
- 	err("CS Error, exiting");
+ 	dev_err(&dev->p_dev->dev, "CS Error, exiting\n");
  	pcmciamtd_release(link);
  	return -ENODEV;
  }