From: Greg KH To: torvalds@transmeta.com Cc: linux-usb-devel@lists.sourceforge.net Subject: [BK PATCH] USB changes for 2.5.5-pre1 This is a merge of my previously mentioned change sets into your most recent tree, fixing up the merge problem that happened in drivers/usb/inode.c Pull from: bk://linuxusb.bkbits.net/linus-2.5 drivers/usb/hub.c | 60 +++++++++++++++++++++++++-------------------- drivers/usb/inode.c | 54 ++-------------------------------------- drivers/usb/serial/visor.c | 9 +++++- drivers/usb/serial/visor.h | 3 +- drivers/usb/usb-skeleton.c | 6 +++- 5 files changed, 51 insertions(+), 81 deletions(-) ------ ChangeSet@1.361, 2002-02-18 21:01:19-08:00, greg@kroah.com usbdevfs: - put back locks that I accidentally took out with the last merge. drivers/usb/inode.c | 3 +++ 1 files changed, 3 insertions(+) ------ ChangeSet@1.360, 2002-02-18 20:50:43-08:00, greg@kroah.com Merge 0 files changed ------ ChangeSet@1.342.2.5, 2002-02-15 12:06:45-08:00, greg@kroah.com usb skeleton driver: - fix by Holger Waechtler for if a device does not have both a bulk in and bulk out endpoint. drivers/usb/usb-skeleton.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) ------ ChangeSet@1.342.2.4, 2002-02-15 12:00:16-08:00, greg@kroah.com usb usbfs: - fixes based on Pat Mochel's latest driverfs fixes based on Al Viro's comments :) drivers/usb/inode.c | 51 --------------------------------------------------- 1 files changed, 51 deletions(-) ------ ChangeSet@1.342.2.3, 2002-02-15 11:59:08-08:00, greg@kroah.com usb visor driver: - added support for the Clie S-360 device drivers/usb/serial/visor.c | 9 +++++++-- drivers/usb/serial/visor.h | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) ------ ChangeSet@1.342.2.2, 2002-02-15 11:58:26-08:00, greg@kroah.com usb hub: - fixed problem where usb_port_status was on the stack. Based on a patch from Martin Diehl drivers/usb/hub.c | 60 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 26 deletions(-) ------ ChangeSet@1.342.2.1, 2002-02-15 11:55:30-08:00, greg@kroah.com usb core: - Fix for removing a device that does not have a driver bound to it. drivers/usb/usb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)