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		2011-05-27 20:06:53 -07:00
..
boards	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
include/mach	Blackfin: update anomaly lists to latest public info	2011-05-25 08:24:08 -04:00
dma.c	Blackfin: dma: constify MMR pointer array	2011-01-10 07:18:05 -05:00
ints-priority.c	Blackfin: bf537: demux port H mask A and emac rx ints	2011-05-25 08:13:43 -04:00
Kconfig	Blackfin: SIC: BF537: change default data/error relative priorities	2010-10-22 03:48:49 -04:00
Makefile	Blackfin arch: fix bugs and unify BFIN_KERNEL_CLOCK option	2009-01-07 23:14:39 +08:00