From: Nicolas Pitre Date: Mon, 29 Aug 2011 19:29:00 +0000 (-0400) Subject: Merge the enabling by default of ARM_PATCH_PHYS_VIRT X-Git-Tag: v3.2-rc1~40^2^2~48 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96f90c791512bf8ceb50572a0e65d4cabb665c60;p=pandora-kernel.git Merge the enabling by default of ARM_PATCH_PHYS_VIRT Conflicts: arch/arm/mach-msm/board-msm7x30.c --- 96f90c791512bf8ceb50572a0e65d4cabb665c60 Reading git-diff-tree failed