Change-Id: I9ace6222750954e43b4b57d049bb74645fb06424 Signed-off-by: David Ng <dave@codeaurora.org> (cherry picked from commit 76c5892fc1fa36e4e5ebabd2c4e0f10593233b62) Conflicts: arch/arm/mm/proc-v7.S
Change-Id: I9ace6222750954e43b4b57d049bb74645fb06424 Signed-off-by: David Ng <dave@codeaurora.org> (cherry picked from commit 76c5892fc1fa36e4e5ebabd2c4e0f10593233b62) Conflicts: arch/arm/mm/proc-v7.S