Merge http://linux.bkbits.net/linux-2.5

into burns.home.kernel.dk:/usr/local/kernel/BK/linux-2.5

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

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

diff --cc drivers/usb/storage/scsiglue.c
Simple merge

diff --cc drivers/usb/storage/transport.c
Simple merge

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

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