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>
This commit is contained in:
Greg Kroah-Hartman
2012-08-27 07:15:30 -07:00
871 changed files with 10187 additions and 6602 deletions

View File

@@ -789,10 +789,11 @@ static int tegra_ehci_remove(struct platform_device *pdev)
#endif
usb_remove_hcd(hcd);
usb_put_hcd(hcd);
tegra_usb_phy_close(tegra->phy);
usb_put_hcd(hcd);
clk_disable_unprepare(tegra->clk);
clk_disable_unprepare(tegra->emc_clk);