]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge Linux 2.6.23
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 13 Oct 2007 13:43:54 +0000 (14:43 +0100)
1  2 
fs/Kconfig
fs/jffs2/fs.c

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