linux-stable-rt/arch/arm/mach-orion5x
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
Kconfig
Makefile
Makefile.boot
addr-map.c
common.c
common.h
d2net-setup.c
db88f5281-setup.c
dns323-setup.c
edmini_v2-setup.c
irq.c
kurobox_pro-setup.c
ls-chl-setup.c
ls_hgl-setup.c
lsmini-setup.c
mpp.c
mpp.h
mss2-setup.c
mv2120-setup.c
net2big-setup.c
pci.c
rd88f5181l-fxo-setup.c
rd88f5181l-ge-setup.c
rd88f5182-setup.c
rd88f6183ap-ge-setup.c
terastation_pro2-setup.c
ts78xx-fpga.h
ts78xx-setup.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
ts209-setup.c
ts409-setup.c
tsx09-common.c
tsx09-common.h
wnr854t-setup.c
wrt350n-v2-setup.c