Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 17 Jan 2007 23:34:51 +0000 (10:34 +1100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 17 Jan 2007 23:34:51 +0000 (10:34 +1100)
commit9cdf083f981b8d37b3212400a359368661385099
treeaa15a6a08ad87e650dea40fb59b3180bef0d345b
parente499e01d234a31d59679b7b1e1cf628d917ba49a
parenta8b3485287731978899ced11f24628c927890e78
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
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