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
..
arch-v10	mtd: cris: convert to mtd_device_register()	2011-05-25 02:21:07 +01:00
arch-v32	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
boot	Fix common misspellings	2011-03-31 11:26:23 -03:00
configs	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
include	Fix common misspellings	2011-03-31 11:26:23 -03:00
kernel	Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2011-05-24 11:53:42 -07:00
mm	mm: now that all old mmu_gather code is gone, remove the storage	2011-05-25 08:39:16 -07:00
Kconfig	Merge git://git.infradead.org/mtd-2.6	2011-05-27 20:06:53 -07:00
Kconfig.debug	CRIS: Add config for pausing a seg-faulting process	2010-08-04 18:28:48 +02:00
Makefile	arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0	2009-09-20 12:28:22 +02:00