summaryrefslogtreecommitdiff
path: root/arch/arm/mach-prima2/include/mach
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-08-29 15:29:00 -0400
committerNicolas Pitre <nico@fluxnic.net>2011-08-29 15:29:00 -0400
commit96f90c791512bf8ceb50572a0e65d4cabb665c60 (patch)
tree33ed5d6e4ce2ef005a43b0a5e2b9a70e3866d7f4 /arch/arm/mach-prima2/include/mach
parentad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (diff)
parentdaece59689e76ed55d8863cae04993679a8e844e (diff)
Merge the enabling by default of ARM_PATCH_PHYS_VIRT
Conflicts: arch/arm/mach-msm/board-msm7x30.c
Diffstat (limited to 'arch/arm/mach-prima2/include/mach')
0 files changed, 0 insertions, 0 deletions