]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Fri, 27 Apr 2007 18:16:19 +0000 (19:16 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Fri, 27 Apr 2007 18:16:19 +0000 (19:16 +0100)
commitbd0160d787cceba6e637c34037a9cb7352b2bbf8
tree7f98317bdd45dbdb7644e9179891c5af6a3a8ef1
parent6ab8683ebaf2b08223373b7d184191518f017ba5
parentcc4900e8e54c5db804d791349efd632062f0e34d
Merge branch 'master' of git://git.kernel.org/pub/scm/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