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

into kroah.com:/home/greg/linux/BK/gregkh-2.6

diff --cc CREDITS
Simple merge

diff --cc drivers/usb/class/usb-midi.c
Simple merge

diff --cc drivers/usb/class/usblp.c
Simple merge

diff --cc drivers/usb/core/file.c
Simple merge

diff --cc drivers/usb/input/hiddev.c
Simple merge

diff --cc drivers/usb/media/dabusb.c
Simple merge

diff --cc drivers/usb/misc/brlvger.c
Simple merge

diff --cc drivers/usb/misc/tiglusb.c
Simple merge

diff --cc drivers/usb/usb-skeleton.c
Simple merge