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)
commit01863b94e7ea138703dbcc3a0e5d49828a5cf4ff
tree4490b2dc52e3e8ef3686b560ae8e4da69224cbb7
parent56edb8f957edbfe32739a5c709bf8f587be52724
parent91406b03fa4add49db13e55c3220911be55d9883
Merge remote branch android-2.6.36 into android-tegra-2.6.36

Change-Id: I1d7f83e8eb433df8076a9d636ff03e174a3ff581
arch/arm/Kconfig
arch/arm/mm/proc-v7.S