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)
commit96f90c791512bf8ceb50572a0e65d4cabb665c60
tree33ed5d6e4ce2ef005a43b0a5e2b9a70e3866d7f4
parentad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893
parentdaece59689e76ed55d8863cae04993679a8e844e
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