linux-sg2042/arch/arm/plat-mxc
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
..
include/mach Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
Kconfig MXC: Add a digital audio multiplexer driver 2009-11-14 10:30:39 +01:00
Makefile USB: Add EHCI support for MX27 and MX31 based boards 2009-12-11 11:55:18 -08:00
audmux-v1.c i.MX27 audmux: Fix register offsets 2009-12-02 12:17:16 +01:00
audmux-v2.c MXC: Add a digital audio multiplexer driver 2009-11-14 10:30:39 +01:00
clock.c [ARM] MXC: remove the now unused #ifndef CONFIG_COMMON_CLKDEV 2009-08-07 12:11:11 +02:00
cpu.c [ARM] MXC: add cpu_is_ macros 2009-03-13 10:34:26 +01:00
devices.c arm/imx2x: removes a bunch of sparse-warnings 2009-03-13 10:33:52 +01:00
dma-mx1-mx2.c mxc: mx1/mx2 DMA: add a possibility to create an endless DMA transfer 2009-11-24 08:40:14 +01:00
ehci.c USB: Add EHCI support for MX27 and MX31 based boards 2009-12-11 11:55:18 -08:00
gpio.c imx/gpio: Use handle_level_irq 2009-11-14 10:29:15 +01:00
iomux-mx1-mx2.c arm/imx2x: new IOMUX definitions 2009-03-13 10:33:44 +01:00
iomux-v3.c mxc: iomux v3: remove resource handling 2009-11-24 08:39:43 +01:00
irq.c MXC: use variable for irq controller base in entry-macro.S 2009-08-14 12:40:39 +02:00
pwm.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
system.c MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
time.c MXC: add basic MXC91231 support 2009-08-14 12:40:46 +02:00
ulpi.c MXC: Add support for ULPI Viewports 2009-11-14 10:29:15 +01:00