Merge 3.11-rc6 into usb-next

We want these USB fixes in this branch as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/class/usbtmc.c
Simple merge

diff --cc drivers/usb/host/ehci-sched.c
Simple merge

diff --cc drivers/usb/host/xhci-mem.c
index b150360d1e784936afbb3c5d28e2ca327c554a2d,6f8c2fd47675dc2432902f5fbf8b4cfec8a306de..53b972c2a09f10be38a474042d03757618bc76a4
--- 1/drivers/usb/host/xhci-mem.c
--- 2/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@@ -24,9 -24,9 +24,10 @@@
  #include <linux/pci.h>
  #include <linux/slab.h>
  #include <linux/dmapool.h>
+ #include <linux/dma-mapping.h>
  
  #include "xhci.h"
 +#include "xhci-trace.h"
  
  /*
   * Allocates a generic ring segment from the ring pool, sets the dma address,

diff --cc drivers/usb/host/xhci.c
index 7299b591a341286726e2cc90a9d826a506271339,9478caa2f71fb12912ddea1bfa06f37580e7c3ce..bf11af9a46991ce5f12a83970311bb8f73e6b142
--- 1/drivers/usb/host/xhci.c
--- 2/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -27,9 -27,9 +27,10 @@@
  #include <linux/moduleparam.h>
  #include <linux/slab.h>
  #include <linux/dmi.h>
+ #include <linux/dma-mapping.h>
  
  #include "xhci.h"
 +#include "xhci-trace.h"
  
  #define DRIVER_AUTHOR "Sarah Sharp"
  #define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver"

diff --cc drivers/usb/misc/adutux.c
index 7078e9bf0fc0280a8e2a7bec0278eee259abcd29,eeb27208c0d153de863f16ba12e62d0222e8c5d3..3eaa83f05086f90dba7f58df3902610d02537e72
--- 1/drivers/usb/misc/adutux.c
--- 2/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@@ -783,9 -830,11 +783,9 @@@ static int adu_probe(struct usb_interfa
  
        /* let the user know what node this device is now attached to */
        dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n",
-                udev->descriptor.idProduct, dev->serial_number,
+                le16_to_cpu(udev->descriptor.idProduct), dev->serial_number,
                 (dev->minor - ADU_MINOR_BASE));
  exit:
 -      dbg(2, " %s : leave, return value %p (dev)", __func__, dev);
 -
        return retval;
  
  error:

diff --cc drivers/usb/serial/keyspan.c
Simple merge

diff --cc drivers/usb/serial/mos7840.c
Simple merge

diff --cc drivers/usb/serial/ti_usb_3410_5052.c
Simple merge

diff --cc drivers/usb/wusbcore/wa-xfer.c
Simple merge