Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
authorRebecca Schultz Zavin <rebecca@android.com>
Tue, 21 Dec 2010 19:58:04 +0000 (11:58 -0800)
committerRebecca Schultz Zavin <rebecca@android.com>
Tue, 21 Dec 2010 19:58:04 +0000 (11:58 -0800)
1  2 
arch/arm/mach-tegra/Kconfig

Simple merge