Uwe Kleine-König 2dcf78c0ee Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD ... There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h		2010-07-26 14:27:25 +02:00
..
chips	mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips	2010-05-20 16:57:00 +01:00
devices	mtd: sst25l: fix multi-part messages with broken spi masters	2010-05-14 01:52:24 +01:00
lpddr	drivers/mtd: Use kzalloc	2010-05-13 21:23:06 +01:00
maps	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
nand	mxc_nand: add support for platform defined partitions	2010-07-26 14:17:53 +02:00
onenand	mtd: add Samsung SoC OneNAND driver	2010-05-14 01:51:20 +01:00
tests	drivers/mtd: Use kzalloc	2010-05-13 21:23:06 +01:00
ubi	drop unused dentry argument to ->fsync	2010-05-27 22:05:02 -04:00
afs.c
ar7part.c
cmdlinepart.c
ftl.c
inftlcore.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-03-26 14:55:59 +00:00
inftlmount.c
Kconfig	mtd: sm_ftl: remove CONFIG_SM_FTL_MUSEUM and make it always on	2010-03-26 15:28:59 +00:00
Makefile	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-05-10 14:32:46 +01:00
mtd_blkdevs.c
mtdblock_ro.c
mtdblock.c
mtdchar.c	Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing	2010-05-24 08:01:10 -07:00
mtdconcat.c	drivers/mtd: Use kmemdup	2010-05-15 23:07:01 +01:00
mtdcore.c	mtd: update gfp/slab.h includes	2010-05-19 17:21:52 +01:00
mtdcore.h
mtdoops.c
mtdpart.c
mtdsuper.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-05-10 14:32:46 +01:00
nftlcore.c
nftlmount.c
ofpart.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
redboot.c
rfd_ftl.c
sm_ftl.c	bitops: rename for_each_bit() to for_each_set_bit(): mtd	2010-04-08 09:42:41 +01:00
sm_ftl.h
ssfdc.c