Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Steve French [Wed, 9 Nov 2005 22:33:22 +0000 (14:33 -0800)]
1  2 
fs/Kconfig

diff --cc fs/Kconfig
Simple merge