x86_32: Cleanup merge errors in pmap_target.c.
x86_32: Cleanup merge errors in pmap_target.c.

mslovy/barrelfish,kishoredbn/barrelfish,linusyang/barrelfish,BarrelfishOS/barrelfish,8l/barrelfish,linusyang/barrelfish,8l/barrelfish,linusyang/barrelfish,kishoredbn/barrelfish,kishoredbn/barrelfish,utsav2601/cmpe295A,kishoredbn/barrelfish,8l/barrelfish,BarrelfishOS/barrelfish,BarrelfishOS/barrelfish,kishoredbn/barrelfish,utsav2601/cmpe295A,8l/barrelfish,BarrelfishOS/barrelfish,kishoredbn/barrelfish,8l/barrelfish,utsav2601/cmpe295A,utsav2601/cmpe295A,mslovy/barrelfish,linusyang/barrelfish,utsav2601/cmpe295A,mslovy/barrelfish,BarrelfishOS/barrelfish,8l/barrelfish,BarrelfishOS/barrelfish,mslovy/barrelfish,mslovy/barrelfish,BarrelfishOS/barrelfish,BarrelfishOS/barrelfish,utsav2601/cmpe295A,linusyang/barrelfish,mslovy/barrelfish,BarrelfishOS/barrelfish