Merge cantab.net:/usr/src/bklinux-2.5 into cantab.net:/usr/src/tng

author Anton Altaparmakov <aia21@cantab.net>

Wed, 1 May 2002 21:28:59 +0000 (22:28 +0100)

committer Anton Altaparmakov <aia21@cantab.net>

Wed, 1 May 2002 21:28:59 +0000 (22:28 +0100)
author Anton Altaparmakov <aia21@cantab.net>
Wed, 1 May 2002 21:28:59 +0000 (22:28 +0100)
committer Anton Altaparmakov <aia21@cantab.net>
Wed, 1 May 2002 21:28:59 +0000 (22:28 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/ntfs/super.c
Simple merge
author	Anton Altaparmakov <aia21@cantab.net>
	Wed, 1 May 2002 21:28:59 +0000 (22:28 +0100)
committer	Anton Altaparmakov <aia21@cantab.net>
	Wed, 1 May 2002 21:28:59 +0000 (22:28 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ntfs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history