2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
linux-next/arch/arm/mach-bcmring
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 ARM: 5653/1: bcmring: add Makefile of csp code 2009-08-15 16:01:49 +01:00
include Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
arch.c Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
clock.c ARM: 5644/1: add bcmring core.c, clock.c, clock.h 2009-08-15 16:01:38 +01:00
clock.h ARM: 5644/1: add bcmring core.c, clock.c, clock.h 2009-08-15 16:01:38 +01:00
core.c ARM: 5748/1: bcmring: fix build warning messages 2009-10-07 13:13:01 +01:00
core.h ARM: 5643/1: bcmring: arch.c and header files 2009-08-15 16:01:38 +01:00
dma_device.c ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c 2009-08-15 16:01:40 +01:00
dma.c ARM: 5648/1: bcmring: add bmcring dma.c 2009-08-15 16:01:41 +01:00
irq.c ARM: 5645/1: bcmring: add bcmring irq.c 2009-08-15 16:01:39 +01:00
Kconfig ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
Makefile ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
Makefile.boot ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring 2009-08-15 16:01:50 +01:00
mm.c ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers 2009-08-15 16:01:40 +01:00
timer.c ARM: 5649/1: bcmring: add bcmring timer function 2009-08-15 16:01:41 +01:00