Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commitd1da4e50e5d09f02c340927a4fcb7f54202fa033
authorDavid Woodhouse <dwmw2@infradead.org>
Fri, 27 Apr 2007 18:16:19 +0000 (27 19:16 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Fri, 27 Apr 2007 18:16:19 +0000 (27 19:16 +0100)
tree7f98317bdd45dbdb7644e9179891c5af6a3a8ef1
parent78ab67da1002d954ea4c3e2b441e2483c41f94e8
parenta205752d1ad2d37d6597aaae5a56fc396a770868
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

drivers/mtd/Kconfig

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
drivers/mtd/Kconfig
fs/jffs2/fs.c
fs/jffs2/os-linux.h
fs/jffs2/wbuf.c