ia64/xen-unstable

changeset 3671:ed6875102ea3

bitkeeper revision 1.1159.246.1 (4204bf62SAXmiDrhK-FnLlQjHbkY8A)

Manual merge.
Signed-off-by: keir.fraser@cl.cam.ac.uk
author kaf24@scramble.cl.cam.ac.uk
date Sat Feb 05 12:43:14 2005 +0000 (2005-02-05)
parents 4294cfa9fad3 6e1e447cf696
children d8970d36fc08
files xen/arch/x86/traps.c xen/common/schedule.c
line diff