linux-sg2042/arch/arm/mach-ep93xx
Linus Torvalds e0d65113a7 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
2011-11-07 09:11:16 -08:00
..
include/mach Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
Kconfig ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
adssphere.c ARM: mach-ep93xx: convert boot_params to atag_offset 2011-08-21 17:14:46 -04:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
core.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dma.c ep93xx: add dmaengine platform code 2011-06-08 15:45:52 -06:00
edb93xx.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
gesbc9312.c ARM: mach-ep93xx: convert boot_params to atag_offset 2011-08-21 17:14:46 -04:00
micro9.c ARM: mach-ep93xx: convert boot_params to atag_offset 2011-08-21 17:14:46 -04:00
simone.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
snappercl15.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
ts72xx.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
vision_ep9307.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00