Merge bk://linuxvm.bkbits.net/linus-2.5 into cantab.net:/usr/src/tng

author Anton Altaparmakov <aia21@cantab.net>

Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)

committer Anton Altaparmakov <aia21@cantab.net>

Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)
author Anton Altaparmakov <aia21@cantab.net>
Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)
committer Anton Altaparmakov <aia21@cantab.net>
Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)
diff --cc include/linux/fs.h
Simple merge
diff --cc kernel/ksyms.c
Simple merge
author	Anton Altaparmakov <aia21@cantab.net>
	Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)
committer	Anton Altaparmakov <aia21@cantab.net>
	Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)
		1	2
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/ksyms.c	patch \|	diff1 \|	diff2 \|	blob \| history