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
..
drivers	mtd: cris: convert to mtd_device_register()	2011-05-25 02:21:07 +01:00
kernel	cris: convert old cpumask API into new one	2011-05-25 08:39:39 -07:00
lib	tree-wide: fix comment/printk typos	2010-11-01 15:38:34 -04:00
mach-a3	Fix common misspellings	2011-03-31 11:26:23 -03:00
mach-fs	cris: typo in mach-fs Makefile	2011-05-18 13:20:16 +02:00
mm	Merge branch 'for-linus' of git://www.jni.nu/cris	2010-08-08 10:08:26 -07:00
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	2009-03-30 15:22:01 +02:00
output_arch.ld