Merge commit 'xceiv-for-v3.7' into for-3.7/cleanup2

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

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

diff --cc arch/arm/mach-tegra/Makefile
Simple merge

diff --cc drivers/usb/host/ehci-tegra.c
index 26dedb30ad0be75199dbaf81b3c18ec6aa3e961f,65408f7ae92bd7ac6216b76c83829546723c6205..c0d47323b52ad075867051c50fb8daede600b644
--- 1/drivers/usb/host/ehci-tegra.c
--- 2/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -799,12 -801,11 +801,12 @@@ static int tegra_ehci_remove(struct pla
  #endif
  
        usb_remove_hcd(hcd);
 -      usb_put_hcd(hcd);
  
-       tegra_usb_phy_close(tegra->phy);
+       usb_phy_shutdown(&tegra->phy->u_phy);
        iounmap(hcd->regs);
  
 +      usb_put_hcd(hcd);
 +
        clk_disable_unprepare(tegra->clk);
        clk_put(tegra->clk);
  

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