Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorColin Cross <ccross@android.com>
Fri, 8 Oct 2010 02:22:34 +0000 (19:22 -0700)
committerColin Cross <ccross@android.com>
Fri, 8 Oct 2010 02:22:34 +0000 (19:22 -0700)
commit48b97d5a9fda8f632a6fcd17d766f62422aef793
tree22c1f11e855ba60185f32621632835490c5fa4c9
parent1f1f73839877eba40a00ec200c89d3089b3ce13e
parent461cb80c16e4e266ab6207a00767b59212148086
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
arch/arm/mach-tegra/Kconfig

Change-Id: I65b3fafd22be87f9a93cae2d225dd24c174eb7a9
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile