Merge remote branch android-2.6.36 into android-tegra-2.6.36
authorErik Gilling <konkers@android.com>
Fri, 25 Feb 2011 01:17:15 +0000 (17:17 -0800)
committerErik Gilling <konkers@android.com>
Fri, 25 Feb 2011 01:17:21 +0000 (17:17 -0800)
Change-Id: I1d7f83e8eb433df8076a9d636ff03e174a3ff581

1  2 
arch/arm/Kconfig
arch/arm/mm/proc-v7.S

Simple merge
Simple merge