Merge branch 'master' of /home/tglx/work/kernel/git/mtd-2.6/

drivers/mtd/chips/cfi_cmdset_0001.c

drivers/mtd/chips/cfi_cmdset_0020.c

drivers/mtd/devices/doc2000.c

drivers/mtd/devices/doc2001.c

drivers/mtd/devices/doc2001plus.c

drivers/mtd/mtdconcat.c

drivers/mtd/mtdpart.c

drivers/mtd/nand/au1550nd.c

drivers/mtd/nand/diskonchip.c

drivers/mtd/nand/nand_base.c

drivers/mtd/nand/nand_bbt.c

drivers/mtd/nand/nandsim.c

drivers/mtd/nand/rtc_from4.c

drivers/mtd/onenand/onenand_base.c

drivers/mtd/onenand/onenand_bbt.c

fs/jffs2/dir.c

fs/jffs2/erase.c

fs/jffs2/file.c

fs/jffs2/fs.c

fs/jffs2/gc.c