Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Mon, 23 Jul 2007 09:20:10 +0000 (10:20 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Mon, 23 Jul 2007 09:20:10 +0000 (10:20 +0100)
commit39fe5434cb9de5da40510028b17b96bc4eb312b3
tree7a02a317b9ad57da51ca99887c119e779ccf3f13
parent0fc72b81d3111d114ab378935b1cf07680ca1289
parentf695baf2df9e0413d3521661070103711545207a
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/mtd/mtd_blkdevs.c
fs/Kconfig
fs/jffs2/background.c