Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5

author Greg Kroah-Hartman <greg@kroah.com>

Fri, 2 Aug 2002 03:10:33 +0000 (20:10 -0700)

committer Greg Kroah-Hartman <greg@kroah.com>

Fri, 2 Aug 2002 03:10:33 +0000 (20:10 -0700)
author Greg Kroah-Hartman <greg@kroah.com>
Fri, 2 Aug 2002 03:10:33 +0000 (20:10 -0700)
committer Greg Kroah-Hartman <greg@kroah.com>
Fri, 2 Aug 2002 03:10:33 +0000 (20:10 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/usb/core/hub.c
Simple merge
diff --cc drivers/usb/core/usb.c
Simple merge
author	Greg Kroah-Hartman <greg@kroah.com>
	Fri, 2 Aug 2002 03:10:33 +0000 (20:10 -0700)
committer	Greg Kroah-Hartman <greg@kroah.com>
	Fri, 2 Aug 2002 03:10:33 +0000 (20:10 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/usb.c	patch \|	diff1 \|	diff2 \|	blob \| history