linux/arch/arm/mach-ep93xx
Linus Torvalds 05ec7dd8dd 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
2010-05-21 07:25:43 -07:00
..
include/mach Merge git://git.infradead.org/mtd-2.6 2010-05-21 07:25:43 -07:00
adssphere.c ARM: 5992/1: ep93xx: pass platform startup data as __initdata 2010-04-14 11:19:24 +01:00
clock.c ARM: 6124/1: ep93xx: SPI driver platform support code 2010-05-13 12:19:52 +01:00
core.c ARM: 6124/1: ep93xx: SPI driver platform support code 2010-05-13 12:19:52 +01:00
dma-m2p.c ARM: 5876/1: ep93xx: use pr_fmt in dma-m2p.c 2010-01-12 12:38:32 +00:00
edb93xx.c ARM: 5992/1: ep93xx: pass platform startup data as __initdata 2010-04-14 11:19:24 +01:00
gesbc9312.c ARM: 5992/1: ep93xx: pass platform startup data as __initdata 2010-04-14 11:19:24 +01:00
gpio.c ARM: 6029/1: ep93xx: gpio.c: local functions should be static 2010-04-07 21:11:28 +01:00
Kconfig ARM: 5937/1: Add support for EP9315 based Snapper CL15 board 2010-02-15 19:40:50 +00:00
Makefile ARM: 5937/1: Add support for EP9315 based Snapper CL15 board 2010-02-15 19:40:50 +00:00
Makefile.boot ARM: 5744/1: ep93xx: add remaining phys offset selections 2009-10-07 13:11:56 +01:00
micro9.c ARM: 5992/1: ep93xx: pass platform startup data as __initdata 2010-04-14 11:19:24 +01:00
simone.c ARM: 5992/1: ep93xx: pass platform startup data as __initdata 2010-04-14 11:19:24 +01:00
snappercl15.c ARM: 5992/1: ep93xx: pass platform startup data as __initdata 2010-04-14 11:19:24 +01:00
ts72xx.c Merge git://git.infradead.org/mtd-2.6 2010-05-21 07:25:43 -07:00