You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		13 years ago
..
include/mach	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	13 years ago
Kconfig	ARM: mmp: rename SHEEVAD to GPLUGD	13 years ago
Makefile	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	13 years ago
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	13 years ago
aspenite.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
avengers_lite.c	arm: remove machine_desc.io_pg_offst and .phys_io	15 years ago
brownstone.c	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	13 years ago
clock.c	ARM: pxa: add clk_set_rate()	14 years ago
clock.h	ARM: pxa: use correct __iomem annotations	14 years ago
common.c	ARM: pxa: use correct __iomem annotations	14 years ago
common.h	…
devices.c	…
flint.c	ARM: mmp: correct the naming of GPIOxx_GPIO definitions	14 years ago
gplugd.c	Merge branch 'depends/rmk/gpio' into next/fixes	13 years ago
irq-mmp2.c	arm: Cleanup the irq namespace	14 years ago
irq-pxa168.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
jasper.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	14 years ago
mmp2.c	Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc	13 years ago
pxa168.c	Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm	13 years ago
pxa910.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	14 years ago
sram.c	ARM: mmp: add sram allocator	13 years ago
tavorevb.c	ARM: 7104/1: plat-pxa: break out GPIO driver specifics	14 years ago
teton_bga.c	arm: remove machine_desc.io_pg_offst and .phys_io	15 years ago
time.c	ARM: mmp: Change the way we use timer 0 as clockevent timer.	14 years ago
ttc_dkb.c	ARM: 7006/1: Migrate to asm-generic wrapper support	13 years ago