Merge penguin:v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc fs/adfs/super.c
Simple merge

diff --cc fs/affs/super.c
Simple merge

diff --cc fs/bfs/inode.c
Simple merge

diff --cc fs/efs/super.c
Simple merge

diff --cc fs/ext2/super.c
Simple merge

diff --cc fs/ext3/super.c
Simple merge

diff --cc fs/hpfs/super.c
Simple merge

diff --cc fs/isofs/inode.c
Simple merge

diff --cc fs/minix/inode.c
Simple merge

diff --cc fs/ntfs/super.c
Simple merge

diff --cc fs/qnx4/inode.c
Simple merge

diff --cc fs/reiserfs/super.c
Simple merge

diff --cc fs/romfs/inode.c
Simple merge

diff --cc fs/sysv/super.c
Simple merge

diff --cc fs/udf/super.c
Simple merge

diff --cc fs/ufs/super.c
Simple merge