linux/arch/arm/mach-bcmring/include/mach
Linus Torvalds 60d9aa758c Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
2009-12-16 10:23:43 -08:00
..
csp tree-wide: fix misspelling of "definition" in comments 2009-12-04 23:41:47 +01:00
clkdev.h ARM: 5644/1: add bcmring core.c, clock.c, clock.h 2009-08-15 16:01:38 +01:00
dma.h tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
entry-macro.S ARM: 5650/1: bcmring: add io.h, uncompress. h, and entry-macro.S 2009-08-15 16:01:42 +01:00
hardware.h ARM: 5643/1: bcmring: arch.c and header files 2009-08-15 16:01:38 +01:00
io.h ARM: 5792/1: bcmring: clean up mach/io.h 2009-12-03 19:42:30 +00:00
irqs.h ARM: 5645/1: bcmring: add bcmring irq.c 2009-08-15 16:01:39 +01:00
memory.h ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers 2009-08-15 16:01:40 +01:00
memory_settings.h ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers 2009-08-15 16:01:40 +01:00
reg_nand.h mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
reg_umi.h mtd: add bcmring nand driver 2009-10-20 10:07:23 +09:00
system.h ARM: 5748/1: bcmring: fix build warning messages 2009-10-07 13:13:01 +01:00
timer.h ARM: 5649/1: bcmring: add bcmring timer function 2009-08-15 16:01:41 +01:00
timex.h ARM: 5649/1: bcmring: add bcmring timer function 2009-08-15 16:01:41 +01:00
uncompress.h ARM: 5650/1: bcmring: add io.h, uncompress. h, and entry-macro.S 2009-08-15 16:01:42 +01:00
vmalloc.h ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers 2009-08-15 16:01:40 +01:00