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
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
fwh_lock.h
gen_probe.c
jedec_probe.c
Kconfig	Revert "mtd: cleanup Kconfig dependencies"	2010-10-26 11:42:51 +01:00
Makefile
map_absent.c
map_ram.c
map_rom.c