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
..
Kconfig	Blackfin: DNP5370: new board port	14 years ago
Makefile	Blackfin: DNP5370: new board port	14 years ago
cm_bf537e.c	Blackfin: use proper wrapper functions for modifying irq status	14 years ago
cm_bf537u.c	Blackfin: use proper wrapper functions for modifying irq status	14 years ago
dnp5370.c	Blackfin: dnp5370: drop MMC card detect support	14 years ago
minotaur.c	Blackfin: boards: add missing "static" to peripheral lists	14 years ago
pnav10.c	Blackfin: boards: add missing "static" to peripheral lists	14 years ago
stamp.c	Merge git://git.infradead.org/mtd-2.6	14 years ago
tcm_bf537.c	Blackfin: use proper wrapper functions for modifying irq status	14 years ago