bitkeeper revision 1.1236.12.26 (422f4105wE_lbhdvI9pHdsnkR93-iw)
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Wed, 9 Mar 2005 18:31:33 +0000 (18:31 +0000)
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>
Wed, 9 Mar 2005 18:31:33 +0000 (18:31 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xen-unstable.bk

1  2 
xen/arch/x86/mm.c

Simple merge