Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
David Woodhouse [Wed, 17 Jan 2007 23:34:51 +0000 (10:34 +1100)]
1  2 
drivers/mtd/devices/mtd_dataflash.c
drivers/mtd/maps/Kconfig
drivers/mtd/rfd_ftl.c
fs/jffs/jffs_fm.c
fs/jffs2/super.c
fs/jffs2/wbuf.c

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