bitkeeper revision 1.1236.1.68 (422f5a4b3BG7Wh49f5-3defzeghSBw)

Merge bk://xen.bkbits.net/xeno-unstable.bk
into bkbits.net:/repos/x/xen-ia64/xeno-unstable-ia64.bk

diff --cc xen/arch/ia64/patch/linux-2.6.7/time.c
index 78a45f6b90533793703aa85ea2aa2aa706e84513,a21c0465c81b05cc039b207ea29808058402e7da..2bec5b10f63c98d82df077e6e5f32900ccdb6579
--- 1/xen/arch/ia64/patch/linux-2.6.7/time.c
--- 2/xen/arch/ia64/patch/linux-2.6.7/time.c
+++ b/xen/arch/ia64/patch/linux-2.6.7/time.c
@@@ -70,10 -71,10 +70,10 @@@
  +    return now; 
  +}
  +
- +void update_dom_time(struct domain *d)
+ +void update_dom_time(struct exec_domain *ed)
  +{
  +// FIXME: implement this?
 -+     printf("update_dom_time: called, not implemented, skipping\n");
 ++//   printf("update_dom_time: called, not implemented, skipping\n");
  +}
  +
  +/* Set clock to <secs,usecs> after 00:00:00 UTC, 1 January, 1970. */