Merge remote-tracking branch 'tegra/for-next'

diff --cc arch/arm/mach-tegra/board-dt-tegra20.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00.c
Simple merge

diff --cc arch/arm/mach-tegra/board-seaboard.c
Simple merge

diff --cc arch/arm/mach-tegra/board-trimslice.c
Simple merge

diff --cc arch/arm/mach-tegra/devices.c
Simple merge

diff --cc arch/arm/mach-tegra/devices.h
Simple merge

diff --cc arch/arm/mach-tegra/tegra2_clocks.c
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
Simple merge

diff --cc drivers/usb/host/ehci-tegra.c
index 4c1eb61bc2fc6d036cd9a670e83e052d6d02fb1a,14532fe04f5eb98891429c6f9a02c3002463f247..a6e9b2cefee16c58d4c51fb696795345fe5ed374
--- 1/drivers/usb/host/ehci-tegra.c
--- 2/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@@ -562,9 -577,12 +562,10 @@@ static const struct hc_driver tegra_ehc
        .bus_suspend            = tegra_ehci_bus_suspend,
        .bus_resume             = tegra_ehci_bus_resume,
  #endif
 -      .relinquish_port        = ehci_relinquish_port,
 -      .port_handed_over       = ehci_port_handed_over,
  };
  
- static int setup_vbus_gpio(struct platform_device *pdev)
+ static int setup_vbus_gpio(struct platform_device *pdev,
+                          struct tegra_ehci_platform_data *pdata)
  {
        int err = 0;
        int gpio;