linux/drivers/mtd/onenand
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
..
generic.c mtd: do not use plain 0 as NULL 2012-03-27 00:53:20 +01:00
Kconfig MTD: Relax dependencies 2012-03-25 00:29:56 +01:00
Makefile mtd: add Samsung SoC OneNAND driver 2010-05-14 01:51:20 +01:00
omap2.c ARM: OMAP2+: fix build breakage introduced by commit b7754452b3 2012-10-26 13:16:30 -06:00
onenand_base.c mtd: onenand: Make flexonenand_set_boundary static 2012-11-09 17:02:50 +02:00
onenand_bbt.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
onenand_sim.c mtd: convert remaining users to mtd_device_register() 2011-05-25 02:25:00 +01:00
samsung.c mtd: do not use plain 0 as NULL 2012-03-27 00:53:20 +01:00