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

…

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

…

Kconfig

Revert "mtd: cleanup Kconfig dependencies"

2010-10-26 11:42:51 +01:00

Makefile

…

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