Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Wed, 2 Mar 2011 01:27:10 +0000 (17:27 -0800)
committerColin Cross <ccross@android.com>
Wed, 2 Mar 2011 01:27:10 +0000 (17:27 -0800)
commit11267bd7f0943663175ff9edef679a4099a06759
tree1364c91c1d94d098c0094f417fa1006340826779
parent1c9cf0db33bbec8194e7e95af67a98315856d34d
parent4f72bb8eddaeb1ddf290fa367aace61c9947ed54
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
arch/arm/mach-tegra/Kconfig
drivers/serial/tegra_hsuart.c
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile