linux-stable-rt/arch/arm/mach-kirkwood
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
Kconfig [ARM] Kirkwood: add LaCie 5Big Network v2 support 2010-05-03 17:02:42 -04:00
Makefile [ARM] Kirkwood: merge net2big_v2 and net5big_v2 board setups 2010-05-03 17:03:18 -04:00
Makefile.boot
addr-map.c
common.c mtd: kirkwood: allow machines to register RnB callback 2010-05-14 01:04:34 +01:00
common.h mtd: kirkwood: allow machines to register RnB callback 2010-05-14 01:04:34 +01:00
cpuidle.c
db88f6281-bp-setup.c
guruplug-setup.c [ARM] Kirkwood: Marvell GuruPlug support 2010-05-03 16:34:47 -04:00
irq.c
mpp.c
mpp.h
mv88f6281gtw_ge-setup.c [ARM] Kirkwood: WPS button keycode mapping 2010-03-23 13:48:14 -04:00
netspace_v2-setup.c
netxbig_v2-setup.c [ARM] Kirkwood: merge net2big_v2 and net5big_v2 board setups 2010-05-03 17:03:18 -04:00
openrd-setup.c
pcie.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
rd88f6192-nas-setup.c
rd88f6281-setup.c
sheevaplug-setup.c
ts41x-setup.c
ts219-setup.c
tsx1x-common.c
tsx1x-common.h