Jiri Kosina e75d660672 Merge branch 'master' into for-next ... Merge with latest Linus' tree, as I have incoming patches that fix code that is newer than current HEAD of for-next. Conflicts: drivers/net/ethernet/realtek/r8169.c		2012-04-08 21:48:52 +02:00
..
block2mtd.c	mtd: move zero length verification to MTD API functions	2012-03-27 00:32:19 +01:00
doc2000.c	mtd: flash drivers set ecc strength	2012-03-27 00:56:46 +01:00
doc2001.c	mtd: flash drivers set ecc strength	2012-03-27 00:56:46 +01:00
doc2001plus.c	mtd: flash drivers set ecc strength	2012-03-27 00:56:46 +01:00
docecc.c	mtd: spelling, capitalization, uniformity	2011-09-11 15:02:13 +03:00
docg3.c	Merge branch 'master' into for-next	2012-04-08 21:48:52 +02:00
docg3.h	mtd: docg3 add protection against concurrency	2012-03-27 01:03:27 +01:00
docprobe.c	mtd: docprobe: use kzalloc instead	2012-01-09 18:25:51 +00:00
Kconfig	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
lart.c	mtd: move zero length verification to MTD API functions	2012-03-27 00:32:19 +01:00
m25p80.c	mtd: move zero length verification to MTD API functions	2012-03-27 00:32:19 +01:00
Makefile	mtd: ST SPEAr: Add SMI driver for serial NOR flash	2012-03-27 00:14:16 +01:00
ms02-nv.c	mtd: do not duplicate length and offset checks in drivers	2012-03-27 00:28:18 +01:00
ms02-nv.h	MTD/JFFS2: remove CVS keywords	2008-06-04 17:50:17 +01:00
mtd_dataflash.c	mtd: move zero length verification to MTD API functions	2012-03-27 00:32:19 +01:00
mtdram.c	mtd: harmonize mtd_point interface implementation	2012-03-27 00:32:11 +01:00
phram.c	mtd: phram: fix section mismatch for phram_setup	2012-03-27 01:02:29 +01:00
pmc551.c	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
slram.c	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
spear_smi.c	mtd: add device-tree support to spear_smi	2012-03-27 01:01:21 +01:00
sst25l.c	mtd: do not use plain 0 as NULL	2012-03-27 00:53:20 +01:00