Arnd Bergmann 4f5a9fd341 Merge branch 'imx/pinctrl' into imx/clock ... Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c drivers/net/ethernet/freescale/fec.c drivers/spi/spi-imx.c drivers/tty/serial/imx.c This resolves dependencies between the pinctrl and clock changes in imx. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 15:30:52 +02:00
..
chips	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
devices	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
lpddr	mtd: move zero length verification to MTD API functions	2012-03-27 00:32:19 +01:00
maps	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
nand	Merge branch 'imx/pinctrl' into imx/clock	2012-05-14 15:30:52 +02:00
onenand	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
tests
ubi	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
afs.c
ar7part.c
bcm63xxpart.c
cmdlinepart.c
ftl.c
inftlcore.c	mtd: add leading underscore to all mtd functions	2012-03-27 00:20:01 +01:00
inftlmount.c
Kconfig	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
Makefile
mtd_blkdevs.c	mtd: mtdblock: call mtd_sync() only if opened for write	2012-03-27 00:11:11 +01:00
mtdblock.c	mtd: mtdblock: call mtd_sync() only if opened for write	2012-03-27 00:11:11 +01:00
mtdblock_ro.c
mtdchar.c	fix breakage in mtdchar_open(), sanitize failure exits	2012-04-09 01:38:55 -04:00
mtdconcat.c	mtd: unify initialization of erase_info->fail_addr	2012-03-27 01:02:24 +01:00
mtdcore.c	mtd: unify initialization of erase_info->fail_addr	2012-03-27 01:02:24 +01:00
mtdcore.h
mtdoops.c	mtdoops: clean-up new MTD API usage	2012-03-27 00:23:53 +01:00
mtdpart.c	mtd: flash drivers set ecc strength	2012-03-27 00:56:46 +01:00
mtdsuper.c
mtdswap.c
nftlcore.c	mtd: nftlcore: remove out-of-date and now irrelevant piece of code	2012-03-27 00:24:03 +01:00
nftlmount.c
ofpart.c
redboot.c	mtd: redboot: remove useless code	2012-03-27 00:24:14 +01:00
rfd_ftl.c
sm_ftl.c	mtd: sm_ftl: fix typo in major number.	2012-03-27 01:01:26 +01:00
sm_ftl.h
ssfdc.c