Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (120 commits)
  usb: don't update devnum for wusb devices
  wusb: make ep0_reinit available for modules
  wusb: devices dont use a set address
  wusb: teach choose_address() about wireless devices
  wusb: add link wusb-usb device
  wusb: add authenticathed bit to usb_dev
  USB: remove unnecessary type casting of urb->context
  usb serial: more fixes and groundwork for tty changes
  USB: replace remaining __FUNCTION__ occurrences
  USB: usbfs: export the URB_NO_INTERRUPT flag to userspace
  USB: fix compile problems in ehci-hcd
  USB: ehci: qh_completions cleanup and bugfix
  USB: cdc-acm: signedness fix
  USB: add documentation about callbacks
  USB: don't explicitly reenable root-hub status interrupts
  USB: OHCI: turn off RD when remote wakeup is disabled
  USB: HCDs use the do_remote_wakeup flag
  USB: g_file_storage: ignore bulk-out data after invalid CBW
  USB: serial: remove endpoints setting checks from core and header
  USB: serial: remove unneeded number endpoints settings
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 9c7eb6144d02..a53db1d4e07a 100644
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -33,8 +33,8 @@ config USB_EMI26
           module will be called emi26.
 
 config USB_ADUTUX
-        tristate "ADU devices from Ontrak Control Systems (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "ADU devices from Ontrak Control Systems"
+        depends on USB
         help
           Say Y if you want to use an ADU device from Ontrak Control
           Systems.
@@ -43,8 +43,8 @@ config USB_ADUTUX
           will be called adutux.
 
 config USB_AUERSWALD
-        tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "USB Auerswald ISDN support"
+        depends on USB
         help
           Say Y here if you want to connect an Auerswald USB ISDN Device
           to your computer's USB port.
@@ -53,8 +53,8 @@ config USB_AUERSWALD
           module will be called auerswald.
 
 config USB_RIO500
-        tristate "USB Diamond Rio500 support (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "USB Diamond Rio500 support"
+        depends on USB
         help
           Say Y here if you want to connect a USB Rio500 mp3 player to your
           computer's USB port. Please read <file:Documentation/usb/rio.txt>
@@ -64,8 +64,8 @@ config USB_RIO500
           module will be called rio500.
 
 config USB_LEGOTOWER
-        tristate "USB Lego Infrared Tower support (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "USB Lego Infrared Tower support"
+        depends on USB
         help
           Say Y here if you want to connect a USB Lego Infrared Tower to your
           computer's USB port.
@@ -259,8 +259,8 @@ config USB_IOWARRIOR
           module will be called iowarrior.
 
 config USB_TEST
-        tristate "USB testing driver (DEVELOPMENT)"
-        depends on USB && USB_DEVICEFS && EXPERIMENTAL
+        tristate "USB testing driver"
+        depends on USB && USB_DEVICEFS
         help
           This driver is for testing host controller software.  It is used
           with specialized device firmware for regression and stress testing,