Olof Johansson 0f9cb211ba Linux 3.7-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1 3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+ 35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4= =CPoy -----END PGP SIGNATURE----- Merge tag 'v3.7-rc7' into next/cleanup Merging in mainline back to next/cleanup since it has collected a few conflicts between fixes going upstream and some of the cleanup patches. Git doesn't auto-resolve some of them, and they're mostly noise so let's take care of it locally. Conflicts are in: arch/arm/mach-omap2/omap_hwmod_44xx_data.c arch/arm/plat-omap/i2c.c drivers/video/omap2/dss/dss.c Signed-off-by: Olof Johansson <olof@lixom.net>		2012-11-25 21:34:34 -08:00
..
chips	mtd: cfi_cmdset_0001: Fix problem with unlocking timeout	2012-09-29 15:29:08 +01:00
devices	mtd: slram: invalid checking of absolute end address	2012-11-09 17:02:50 +02:00
lpddr	mtd: lpddr: replace open-coded ARRAY_SIZE with macro	2012-05-13 22:47:31 -05:00
maps	mtd: autcpu12-nvram: drop frees of devm_ alloc'd data	2012-09-29 15:33:36 +01:00
nand	Linux 3.7-rc7	2012-11-25 21:34:34 -08:00
onenand	Linux 3.7-rc7	2012-11-25 21:34:34 -08:00
tests	mtd: mtd_nandecctest: add double bit error detection tests	2012-09-29 15:48:02 +01:00
ubi	This pull request contains the UBI fastmap support implemented by Richard	2012-10-08 20:40:45 +09:00
afs.c	mtd: introduce mtd_read interface	2012-01-09 18:25:19 +00:00
ar7part.c	mtd: introduce mtd_read interface	2012-01-09 18:25:19 +00:00
bcm47xxpart.c	mtd: bcm47part driver for BCM47XX chipsets	2012-09-29 15:32:31 +01:00
bcm63xxpart.c	mtd: bcm63xxpart: handle Broadcom partition order	2012-05-13 22:55:03 -05:00
cmdlinepart.c	mtd: cmdlinepart: make the partitions rule more strict	2012-09-29 15:44:25 +01:00
ftl.c	mtd: do not use mtd->sync directly	2012-01-09 18:26:21 +00:00
inftlcore.c	mtd: add leading underscore to all mtd functions	2012-03-27 00:20:01 +01:00
inftlmount.c	mtd: introduce mtd_block_markbad interface	2012-01-09 18:25:48 +00:00
Kconfig	mtd: bcm47part driver for BCM47XX chipsets	2012-09-29 15:32:31 +01:00
Makefile	mtd: bcm47part driver for BCM47XX chipsets	2012-09-29 15:32:31 +01:00
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	mtd: introduce mtd_write interface	2012-01-09 18:25:20 +00:00
mtdchar.c	mtd: Disable mtdchar mmap on MMU systems	2012-10-09 15:08:42 +01:00
mtdconcat.c	mtd: unify initialization of erase_info->fail_addr	2012-03-27 01:02:24 +01:00
mtdcore.c	UAPI Disintegration 2012-10-09	2012-10-09 15:04:25 +01:00
mtdcore.h	mtd: hide parse_mtd_partitions	2011-09-11 15:02:13 +03:00
mtdoops.c	UAPI Disintegration 2012-10-09	2012-10-09 15:04:25 +01:00
mtdpart.c	UAPI Disintegration 2012-10-09	2012-10-09 15:04:25 +01:00
mtdsuper.c	VFS: Pass mount flags to sget()	2012-07-14 16:38:34 +04:00
mtdswap.c	mtd: do not use mtd->block_markbad directly	2012-01-09 18:26:26 +00:00
nftlcore.c	mtd: nftlcore: remove out-of-date and now irrelevant piece of code	2012-03-27 00:24:03 +01:00
nftlmount.c	mtd: introduce mtd_block_markbad interface	2012-01-09 18:25:48 +00:00
ofpart.c	mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions()	2012-10-10 09:12:39 +01:00
redboot.c	mtd: redboot: remove useless code	2012-03-27 00:24:14 +01:00
rfd_ftl.c	mtd: do not use mtd->sync directly	2012-01-09 18:26:21 +00:00
sm_ftl.c	mtd: kill MTD_NAND_VERIFY_WRITE	2012-09-29 15:00:46 +01:00
sm_ftl.h	mtd: sm_ftl: cosmetic, use bool when possible	2010-10-25 01:33:08 +01:00
ssfdc.c	mtd: introduce mtd_block_isbad interface	2012-01-09 18:25:47 +00:00