linux/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 Merge branch 'misc2' into devel 2010-02-25 22:09:41 +00:00
addr-map.c [ARM] Kirkwood: clarify PCIe MEM bus/physical address distinction 2009-11-07 20:18:24 -05:00
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 [ARM] Kirkwood: CPU idle driver 2009-06-08 13:04:41 -04:00
db88f6281-bp-setup.c [ARM] Kirkwood: rationalize NAND setup a bit 2009-06-08 13:04:58 -04:00
guruplug-setup.c [ARM] Kirkwood: Marvell GuruPlug support 2010-05-03 16:34:47 -04:00
irq.c [ARM] 5460/1: Orion: reduce namespace pollution 2009-04-23 23:25:41 +01:00
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 [ARM] add Marvell Kirkwood (88F6000) SoC support 2008-06-22 22:45:06 +02:00
mpp.c [ARM] orion: convert gpio to use gpiolib 2009-06-08 13:04:57 -04:00
mpp.h [ARM] Kirkwood: Correct header define 2009-07-06 23:54:56 -04:00
mv88f6281gtw_ge-setup.c [ARM] Kirkwood: WPS button keycode mapping 2010-03-23 13:48:14 -04:00
netspace_v2-setup.c [ARM] Kirkwood: define SATA LED for netspace_v2 2010-02-09 21:05:49 -05:00
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 [ARM] kirkwood: combine support for openrd base/client support 2010-02-05 00:27:04 -05:00
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 [ARM] Kirkwood: drive USB VBUS pin on rd88f6192-nas high on boot 2010-01-10 22:23:43 -05:00
rd88f6281-setup.c [ARM] Kirkwood: rationalize NAND setup a bit 2009-06-08 13:04:58 -04:00
sheevaplug-setup.c [ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP 2010-02-23 16:44:01 -05:00
ts41x-setup.c [ARM] Kirkwood: Remove code duplication in QNAP setup files 2009-11-13 12:14:24 -05:00
ts219-setup.c [ARM] Kirkwood: Remove code duplication in QNAP setup files 2009-11-13 12:14:24 -05:00
tsx1x-common.c [ARM] Kirkwood: Remove code duplication in QNAP setup files 2009-11-13 12:14:24 -05:00
tsx1x-common.h [ARM] Kirkwood: Remove code duplication in QNAP setup files 2009-11-13 12:14:24 -05:00