projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f674d64 59c9dbc)
Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 27 Jan 2006 21:18:15 +0000 (22:18 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Fri, 27 Jan 2006 21:18:15 +0000 (22:18 +0100)
Signed-off-by: Steven Smith, sos22@cam.ac.uk
1  2 
xen/arch/x86/mm.c patch | diff1 | diff2 | blob | history
xen/include/public/xen.h patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/mm.c
Simple merge
diff --cc xen/include/public/xen.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.