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 29a6ccca38 Merge git://git.infradead.org/mtd-2.6 ... * git://git.infradead.org/mtd-2.6: (97 commits) mtd: kill CONFIG_MTD_PARTITIONS mtd: remove add_mtd_partitions, add_mtd_device and friends mtd: convert remaining users to mtd_device_register() mtd: samsung onenand: convert to mtd_device_register() mtd: omap2 onenand: convert to mtd_device_register() mtd: txx9ndfmc: convert to mtd_device_register() mtd: tmio_nand: convert to mtd_device_register() mtd: socrates_nand: convert to mtd_device_register() mtd: sharpsl: convert to mtd_device_register() mtd: s3c2410 nand: convert to mtd_device_register() mtd: ppchameleonevb: convert to mtd_device_register() mtd: orion_nand: convert to mtd_device_register() mtd: omap2: convert to mtd_device_register() mtd: nomadik_nand: convert to mtd_device_register() mtd: ndfc: convert to mtd_device_register() mtd: mxc_nand: convert to mtd_device_register() mtd: mpc5121_nfc: convert to mtd_device_register() mtd: jz4740_nand: convert to mtd_device_register() mtd: h1910: convert to mtd_device_register() mtd: fsmc_nand: convert to mtd_device_register() ... Fixed up trivial conflicts in - drivers/mtd/maps/integrator-flash.c: removed in ARM tree - drivers/mtd/maps/physmap.c: addition of afs partition probe type clashing with removal of CONFIG_MTD_PARTITIONS		14 years ago
..
include/mach	ARM: zImage: remove the static qualifier from global data variables	14 years ago
Kconfig	ARM: 6130/1: Gemini: add support for Raidsonic IB4220	15 years ago
Makefile	ARM: 6130/1: Gemini: add support for Raidsonic IB4220	15 years ago
Makefile.boot	…
board-nas4220b.c	ARM: 6604/1: Gemini: add platform support for Gemini RTC	14 years ago
board-rut1xx.c	ARM: 6604/1: Gemini: add platform support for Gemini RTC	14 years ago
board-wbd111.c	arm: mtd: gemini: convert to mtd_device_register()	14 years ago
board-wbd222.c	arm: mtd: gemini: convert to mtd_device_register()	14 years ago
common.h	ARM: 6604/1: Gemini: add platform support for Gemini RTC	14 years ago
devices.c	ARM: 6604/1: Gemini: add platform support for Gemini RTC	14 years ago
gpio.c	arm: Fold irq_set_chip/irq_set_handler	14 years ago
irq.c	arm: Cleanup the irq namespace	14 years ago
mm.c	…
time.c	…