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)
Conflicts:
arch/arm/mach-msm/board-msm7x30.c


Trivial merge