Merge kroah.com:/home/greg/linux/BK/bleed-2.6
authorGreg Kroah-Hartman <greg@kroah.com>
Mon, 13 Sep 2004 03:02:40 +0000 (20:02 -0700)
committerGreg Kroah-Hartman <greg@kroah.com>
Mon, 13 Sep 2004 03:02:40 +0000 (20:02 -0700)
into kroah.com:/home/greg/linux/BK/usb-2.6

1  2 
CREDITS
MAINTAINERS

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge