Merge 3.6-rc6 into usb-next

This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/twl-common.c
Simple merge

diff --cc drivers/usb/core/quirks.c
Simple merge

diff --cc drivers/usb/dwc3/core.c
Simple merge

diff --cc drivers/usb/dwc3/ep0.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
index ba444e7f9c4448d4f7a2ba7305bd88379f1a35a4,c2813c2b005a8e223f93ff50a3215e24172904c2..c9e729a4bf6562876ba58b1776ce235ecc5ca5ed
--- 1/drivers/usb/dwc3/gadget.c
--- 2/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -1078,10 -1091,26 +1082,23 @@@ static int __dwc3_gadget_ep_queue(struc
         *
         */
        if (dep->flags & DWC3_EP_PENDING_REQUEST) {
+               int     ret;
+ 
+               /*
+                * If xfernotready is already elapsed and it is a case
+                * of isoc transfer, then issue END TRANSFER, so that
+                * you can receive xfernotready again and can have
+                * notion of current microframe.
+                */
+               if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) {
+                       dwc3_stop_active_transfer(dwc, dep->number);
+                       return 0;
+               }
+ 
                ret = __dwc3_gadget_kick_transfer(dep, 0, true);
 -              if (ret && ret != -EBUSY) {
 -                      struct dwc3     *dwc = dep->dwc;
 -
 +              if (ret && ret != -EBUSY)
                        dev_dbg(dwc->dev, "%s: failed to kick transfers\n",
                                        dep->name);
 -              }
        }
  
        /*

diff --cc drivers/usb/gadget/at91_udc.c
Simple merge

diff --cc drivers/usb/gadget/dummy_hcd.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge

diff --cc drivers/usb/host/xhci.h
Simple merge

diff --cc drivers/usb/musb/musb_host.c
Simple merge

diff --cc drivers/usb/musb/musbhsdma.c
Simple merge

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

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