Merge the enabling by default of ARM_PATCH_PHYS_VIRT

Conflicts:
	arch/arm/mach-msm/board-msm7x30.c