Merge bk://linuxusb.bkbits.net/linus-2.5

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

Wed, 3 Apr 2002 09:03:45 +0000 (01:03 -0800)

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

Wed, 3 Apr 2002 09:03:45 +0000 (01:03 -0800)
author Linus Torvalds <torvalds@penguin.transmeta.com>
Wed, 3 Apr 2002 09:03:45 +0000 (01:03 -0800)
committer Linus Torvalds <torvalds@penguin.transmeta.com>
Wed, 3 Apr 2002 09:03:45 +0000 (01:03 -0800)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Linus Torvalds <torvalds@penguin.transmeta.com>
	Wed, 3 Apr 2002 09:03:45 +0000 (01:03 -0800)
committer	Linus Torvalds <torvalds@penguin.transmeta.com>
	Wed, 3 Apr 2002 09:03:45 +0000 (01:03 -0800)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history