linux-stable-rt/arch/arm/mach-davinci/include/mach
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
..
aemif.h
asp.h
cdce949.h
clock.h
common.h
cp_intc.h
cpufreq.h
cpuidle.h
cputype.h
da8xx.h
ddr2.h ARM: mach-davinci: remove mach/memory.h 2011-10-13 12:49:47 -04:00
debug-macro.S ARM: mach-davinci: clean up debug-macro.S 2011-09-26 10:11:28 -04:00
dm355.h
dm365.h
dm644x.h
dm646x.h
edma.h
entry-macro.S
gpio-davinci.h
gpio.h ARM: 7142/1: davinci: mark GPIO implementation complex 2011-11-05 19:09:47 +00:00
hardware.h
i2c.h
io.h
irqs.h
keyscan.h
mmc.h
mux.h
nand.h
pm.h
psc.h
serial.h ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset 2011-09-26 10:11:27 -04:00
spi.h
sram.h
system.h
time.h
timex.h
tnetv107x.h
uncompress.h ARM: mach-davinci: make DAVINCI_UART_INFO into a relative offset 2011-09-26 10:11:27 -04:00
usb.h
vmalloc.h