Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Thu, 9 Dec 2010 03:54:37 +0000 (19:54 -0800)
committerColin Cross <ccross@android.com>
Thu, 9 Dec 2010 03:54:37 +0000 (19:54 -0800)
commit42907f1736fe39cdf39b5f583fcd6b9e4e257b18
tree8f13b9c7990bb6f5c39b2869e6829c72153d0ee0
parent2bc50e6e810abc002ccb32e46f36d20114d0b249
parent85f7f645fb1c386b7b01044f2402587d9beda517
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile