Merge tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB patches from Greg Kroah-Hartman:
 "Here's the big USB patch set for the 3.6-rc1 merge window.

  Lots of little changes in here, primarily for gadget controllers and
  drivers.  There's some scsi changes that I think also went in through
  the scsi tree, but they merge just fine.  All of these patches have
  been in the linux-next tree for a while now.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

Fix up trivial conflicts in include/scsi/scsi_device.h (same libata
conflict that Jeff had already encountered)

* tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (207 commits)
  usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
  usb: Add quirk detection based on interface information
  usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h
  USB: ehci-s5p: Add vbus setup function to the s5p ehci glue layer
  USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
  USB: notify phy when root hub port connect change
  USB: remove 8 bytes of padding from usb_host_interface on 64 bit builds
  USB: option: add ZTE MF821D
  USB: sierra: QMI mode MC7710 moved to qcserial
  USB: qcserial: adding Sierra Wireless devices
  USB: qcserial: support generic Qualcomm serial ports
  USB: qcserial: make probe more flexible
  USB: qcserial: centralize probe exit path
  USB: qcserial: consolidate usb_set_interface calls
  USB: ehci-s5p: Add support for device tree
  USB: ohci-exynos: Add support for device tree
  USB: ehci-omap: fix compile failure(v1)
  usb: host: tegra: pass correct pointer in ehci_setup()
  USB: ehci-fsl: Update ifdef check to work on 64-bit ppc
  USB: serial: keyspan: Removed unrequired parentheses.
  ...

1 files changed, 16 insertions, 5 deletions

diff --git a/tools/usb/testusb.c b/tools/usb/testusb.c
index 82d7c590c026..b0adb2710c02 100644
--- a/tools/usb/testusb.c
+++ b/tools/usb/testusb.c
@@ -425,7 +425,7 @@ int main (int argc, char **argv)
         /* for easy use when hotplugging */
         device = getenv ("DEVICE");
 
-        while ((c = getopt (argc, argv, "D:aA:c:g:hns:t:v:")) != EOF)
+        while ((c = getopt (argc, argv, "D:aA:c:g:hlns:t:v:")) != EOF)
         switch (c) {
         case 'D':       /* device, if only one */
                 device = optarg;
@@ -468,10 +468,21 @@ int main (int argc, char **argv)
         case 'h':
         default:
 usage:
-                fprintf (stderr, "usage: %s [-n] [-D dev | -a | -A usbfs-dir]\n"
-                        "\t[-c iterations]  [-t testnum]\n"
-                        "\t[-s packetsize] [-g sglen] [-v vary]\n",
-                        argv [0]);
+                fprintf (stderr,
+                        "usage: %s [options]\n"
+                        "Options:\n"
+                        "\t-D dev               only test specific device\n"
+                        "\t-A usbfs-dir\n"
+                        "\t-a           test all recognized devices\n"
+                        "\t-l           loop forever(for stress test)\n"
+                        "\t-t testnum   only run specified case\n"
+                        "\t-n           no test running, show devices to be tested\n"
+                        "Case arguments:\n"
+                        "\t-c iterations        default 1000\n"
+                        "\t-s packetsize        default 512\n"
+                        "\t-g sglen     default 32\n"
+                        "\t-v vary              default 512\n",
+                        argv[0]);
                 return 1;
         }
         if (optind != argc)