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/plat	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
Kconfig	[ARM] pxa: move ssp into common plat-pxa	2010-05-11 17:24:58 +02:00
Makefile	ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem	2011-10-01 23:41:41 +01:00
dma.c	arch/arm/plat-pxa/dma.c: correct NULL test	2010-05-01 11:33:00 +01:00
mfp.c	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
pwm.c	ARM: pxa: Make id const in pwm_probe()	2010-08-30 09:59:44 +08:00
ssp.c	arm/pxa2xx: reorgazine SSP and SPI header files	2010-12-01 12:18:33 +01:00