Merge v3.6-rc3 into usb-next

This picks up fixes that we need in this branch for testing.

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

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

diff --cc drivers/usb/host/ehci-tegra.c
index ba5039f1c5c2d84e653c4f16885cb90be71ed212,26dedb30ad0be75199dbaf81b3c18ec6aa3e961f..75eca42dd6072f332750f7b54b92d89139296251
--- 1/drivers/usb/host/ehci-tegra.c
--- 2/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -789,14 -797,21 +789,15 @@@ static int tegra_ehci_remove(struct pla
  #endif
  
        usb_remove_hcd(hcd);
-       usb_put_hcd(hcd);
  
        tegra_usb_phy_close(tegra->phy);
 -      iounmap(hcd->regs);
  
+       usb_put_hcd(hcd);
+ 
        clk_disable_unprepare(tegra->clk);
 -      clk_put(tegra->clk);
  
        clk_disable_unprepare(tegra->emc_clk);
 -      clk_put(tegra->emc_clk);
  
 -      kfree(tegra);
        return 0;
  }
  

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