]> git.baikalelectronics.ru Git - kernel.git/commit
Merge the enabling by default of ARM_PATCH_PHYS_VIRT
authorNicolas Pitre <nicolas.pitre@linaro.org>
Mon, 29 Aug 2011 19:29:00 +0000 (15:29 -0400)
committerNicolas Pitre <nico@fluxnic.net>
Mon, 29 Aug 2011 19:29:00 +0000 (15:29 -0400)
commit9a314f19c6f0cac748b0e5b1cd6ff72dec360c67
tree33ed5d6e4ce2ef005a43b0a5e2b9a70e3866d7f4
parent884a17b535a2e4845b822051a1189afad9c2df00
parent848b9bf6c4abe6819e2be847b01ba5bba852fecb
Merge the enabling by default of ARM_PATCH_PHYS_VIRT

Conflicts:
arch/arm/mach-msm/board-msm7x30.c
arch/arm/include/asm/memory.h
arch/arm/mach-msm/board-msm7x30.c