Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
authorColin Cross <ccross@android.com>
Wed, 2 Mar 2011 01:26:56 +0000 (17:26 -0800)
committerColin Cross <ccross@android.com>
Wed, 2 Mar 2011 01:26:56 +0000 (17:26 -0800)
1  2 
arch/arm/mach-tegra/Kconfig

Simple merge