Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

drivers/mtd/Kconfig

drivers/mtd/Makefile

drivers/mtd/afs.c

drivers/mtd/chips/Kconfig

drivers/mtd/chips/Makefile

drivers/mtd/chips/amd_flash.c

drivers/mtd/chips/cfi_cmdset_0001.c

drivers/mtd/chips/cfi_cmdset_0002.c

drivers/mtd/chips/cfi_cmdset_0020.c

drivers/mtd/chips/cfi_probe.c

drivers/mtd/chips/cfi_util.c

drivers/mtd/chips/chipreg.c

drivers/mtd/chips/fwh_lock.h

drivers/mtd/chips/gen_probe.c

drivers/mtd/chips/jedec.c

drivers/mtd/chips/jedec_probe.c

drivers/mtd/chips/map_absent.c

drivers/mtd/chips/sharp.c

drivers/mtd/cmdlinepart.c

drivers/mtd/devices/Kconfig