]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge with rsync://fileserver/linux
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>
Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)
committerThomas Gleixner <tglx@mtd.linutronix.de>
Sun, 26 Jun 2005 21:20:36 +0000 (23:20 +0200)
Update to Linus latest

1  2 
fs/Kconfig
fs/jffs2/background.c

diff --cc fs/Kconfig
Simple merge
Simple merge