Merge master.kernel.org:/home/hch/BK/xfs/linux-2.5

author Linus Torvalds <torvalds@home.transmeta.com>

Sun, 15 Dec 2002 04:29:45 +0000 (20:29 -0800)

committer Linus Torvalds <torvalds@home.transmeta.com>

Sun, 15 Dec 2002 04:29:45 +0000 (20:29 -0800)
author Linus Torvalds <torvalds@home.transmeta.com>
Sun, 15 Dec 2002 04:29:45 +0000 (20:29 -0800)
committer Linus Torvalds <torvalds@home.transmeta.com>
Sun, 15 Dec 2002 04:29:45 +0000 (20:29 -0800)
diff --cc fs/block_dev.c
Simple merge
diff --cc fs/super.c
Simple merge
diff --cc include/linux/fs.h
Simple merge
author	Linus Torvalds <torvalds@home.transmeta.com>
	Sun, 15 Dec 2002 04:29:45 +0000 (20:29 -0800)
committer	Linus Torvalds <torvalds@home.transmeta.com>
	Sun, 15 Dec 2002 04:29:45 +0000 (20:29 -0800)
		1	2
fs/block_dev.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history