Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2...
author黄涛 <huangtao@rock-chips.com>
Sun, 31 Jul 2011 16:17:16 +0000 (00:17 +0800)
committer黄涛 <huangtao@rock-chips.com>
Sun, 31 Jul 2011 16:17:16 +0000 (00:17 +0800)
commita01580d71e50e345388faabf6939673cd1bae7ed
treed2abc5d867cd69b6eaec178fd96fdb7b8b0a913e
parent44a7c5a23db0c91d8e78ea7aec63b5d7341ad3c5
parent9001adc4b8228b7bd4c37cbeebcba2af4b371f43
Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36' into develop-2.6.36

Conflicts:
drivers/mmc/host/sdhci-tegra.c
drivers/net/wireless/bcm4329/dhd_common.c
drivers/net/wireless/bcm4329/dhd_custom_gpio.c
arch/arm/mach-tegra/include/mach/sdhci.h
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/mmc/host/sdhci-tegra.c
drivers/mmc/host/sdhci.h