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 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:21:21 -07:00
aspenite.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
avengers_lite.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
brownstone.c	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:21:21 -07:00
clock.c	ARM: pxa: add clk_set_rate()	2011-07-12 19:45:19 +08:00
clock.h	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
common.c	ARM: pxa: use correct __iomem annotations	2011-10-08 21:03:07 +08:00
common.h	[ARM] mmp: move declarations into SoC specific header file from common.h	2010-08-05 14:34:46 +08:00
devices.c	[ARM] pxa: add base support for Marvell's PXA168 processor line	2009-03-23 10:11:34 +08:00
flint.c	ARM: mmp: correct the naming of GPIOxx_GPIO definitions	2010-12-20 23:07:47 +08:00
gplugd.c	Merge branch 'depends/rmk/gpio' into next/fixes	2011-10-31 22:44:18 +01:00
irq-mmp2.c	arm: Cleanup the irq namespace	2011-03-29 14:47:57 +02:00
irq-pxa168.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
jasper.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
Kconfig	ARM: mmp: rename SHEEVAD to GPLUGD	2011-10-25 20:28:49 +08:00
Makefile	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:21:21 -07:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
mmp2.c	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:21:21 -07:00
pxa168.c	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	2011-10-27 08:39:10 +02:00
pxa910.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
sram.c	ARM: mmp: add sram allocator	2011-10-25 20:29:20 +08:00
tavorevb.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	2011-10-01 23:45:34 +01:00
teton_bga.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
time.c	ARM: mmp: Change the way we use timer 0 as clockevent timer.	2011-08-11 10:10:46 +08:00
ttc_dkb.c	ARM: 7006/1: Migrate to asm-generic wrapper support	2011-10-17 09:12:40 +01:00