projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4e3d33 b7630c6)
bitkeeper revision 1.1236.12.10 (422ddcefnSKZRvTbeADnwuPWCKuy7w)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 8 Mar 2005 17:12:15 +0000 (17:12 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 8 Mar 2005 17:12:15 +0000 (17:12 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/common/page_alloc.c patch | diff1 | diff2 | blob | history

diff --cc xen/common/page_alloc.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.