David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git ... Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>		2010-10-30 12:35:11 +01:00
..
cfi_cmdset_0001.c	mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one	2010-10-26 11:00:18 +01:00
cfi_cmdset_0002.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git	2010-10-30 12:35:11 +01:00
cfi_cmdset_0020.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
cfi_probe.c	mtd: cfi_cmdset_0002: make sector erase command variable	2010-10-26 11:39:17 +01:00
cfi_util.c	mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode	2010-10-26 11:37:26 +01:00
chipreg.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
fwh_lock.h	mtd: fix a huge latency problem in the MTD CFI and LPDDR flash drivers.	2010-05-10 14:22:30 +01:00
gen_probe.c	mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips	2010-05-20 16:57:00 +01:00
jedec_probe.c	mtd: chips: add SST39WF160x NOR-flashes	2010-05-14 02:27:46 +01:00
Kconfig	Revert "mtd: cleanup Kconfig dependencies"	2010-10-26 11:42:51 +01:00
Makefile	[MTD] [CHIPS] Remove MTD_OBSOLETE_CHIPS (jedec, amd_flash, sharp)	2007-05-09 13:34:37 +01:00
map_absent.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
map_ram.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00
map_rom.c	mtd: Remove obsolete <mtd/compatmac.h> include	2010-08-08 21:19:42 +01:00