Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

diff --cc drivers/mtd/devices/mtd_dataflash.c
Simple merge

diff --cc drivers/mtd/maps/Kconfig
Simple merge

diff --cc drivers/mtd/rfd_ftl.c
Simple merge

diff --cc fs/jffs/jffs_fm.c
Simple merge

diff --cc fs/jffs2/super.c
Simple merge

diff --cc fs/jffs2/wbuf.c
Simple merge