Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2...

Conflicts:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/wireless/bcm4329/dhd_common.c
	drivers/net/wireless/bcm4329/dhd_custom_gpio.c

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

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/mmc/host/sdhci-tegra.c
index a0b9750eb8dd02862eb6d76b0ccfdc6f0ea95832,1ccd8c70ab14d838f4246881bf51fbe0b6554744..793915f8b239cd08777bd71a5714b03592f3b032
--- 1/drivers/mmc/host/sdhci-tegra.c
--- 2/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -182,10 -143,9 +182,13 @@@ static int __devinit tegra_sdhci_probe(
        if (plat->force_hs != 0)
                sdhci->quirks |= SDHCI_QUIRK_FORCE_HIGH_SPEED_MODE;
  
 +      sdhci->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY;
 +      if (plat->mmc_data.built_in)
 +              sdhci->mmc->pm_flags = MMC_PM_KEEP_POWER | MMC_PM_IGNORE_PM_NOTIFY;
 +
+       if (plat->rt_disable != 0)
+               sdhci->quirks |= SDHCI_QUIRK_RUNTIME_DISABLE;
+ 
        rc = sdhci_add_host(sdhci);
        if (rc)
                goto err_clk_disable;

diff --cc drivers/mmc/host/sdhci.h
Simple merge