[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
index d5ef97bc4d01..6d95cacd5284 100644
--- a/drivers/net/usb/asix.c
+++ b/drivers/net/usb/asix.c
@@ -1458,6 +1458,10 @@ static const struct usb_device_id	products [] = {
         // IO-DATA ETG-US2
         USB_DEVICE (0x04bb, 0x0930),
         .driver_info = (unsigned long) &ax88178_info,
+}, {
+        // Belkin F5D5055
+        USB_DEVICE(0x050d, 0x5055),
+        .driver_info = (unsigned long) &ax88178_info,
 },
         { },            // END
 };