bitkeeper revision 1.958 (40ca2c68fktLFIliN8Vr7Q8blSgj6w)

merge

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/ignore
index 97a38b7ac4ccc3d28fde5c79a2f50a5f051da400,79939d955ab9135e276f8bc5ededcc84c13be7b1..cf002e46dbfa439c63a52282561c1396eca92c6b
--- 1/BitKeeper/etc/ignore
--- 2/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@@ -1,21 -1,22 +1,24 @@@
--BitKeeper/*/*
--PENDING/*
++*.a
  *.o
++*.pyc
  *.so
  *.so.*
--*.a
--*.pyc
++BitKeeper/*/*
++PENDING/*
++TAGS
  extras/mini-os/h/hypervisor-ifs
++install/*
++linux-*-xen/*
++linux-*.tar.gz
+ linux-2.4.26-xen/*
  linux-xen-sparse
  tools/*/build/lib*/*.py
  tools/balloon/balloon
  tools/misc/miniterm/miniterm
--tools/misc/xen_read_console
  tools/misc/xen_cpuperf
  tools/misc/xen_log
++tools/misc/xen_read_console
  tools/xentrace/xentrace
--xen/xen
--xen/xen.*
  xen/drivers/pci/classlist.h
  xen/drivers/pci/devlist.h
  xen/drivers/pci/gen-devlist
@@@ -24,7 -25,4 +27,5 @@@ xen/include/hypervisor-ifs/arc
  xen/include/xen/compile.h
  xen/tools/elf-reloc
  xen/tools/figlet/figlet
--TAGS
- install/*
- linux-*.tar.gz
- linux-*-xen/*
++xen/xen
++xen/xen.*

diff --cc linux-2.4.26-xen-sparse/arch/xen/Makefile
index 37d71473b07d692b2b966d5d73976fd01b65edeb,a8c7def633102abf2d00a8b5ef36b2038c11a5c6..d29d9d51f3a85213f8e13a31abe918ac9a831ed5
--- 1/linux-2.4.26-xen-sparse/arch/xen/Makefile
--- 2/linux-2.4.26-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.26-xen-sparse/arch/xen/Makefile
@@@ -123,11 -115,6 +123,7 @@@ archclean
        @$(MAKEBOOT) clean
  
  archmrproper:
-       rm -f $(prefix)/boot/vmlinux-syms-$(KERNELRELEASE)
-       rm -f $(prefix)/boot/vmlinuz-$(KERNELRELEASE)
 +      rm -f include/asm-xen/hypervisor-ifs/arch
  
  archdep:
-       rm -f include/asm-xen/hypervisor-ifs/arch
-       ( cd include/asm-xen/hypervisor-ifs ; rm -rf arch ; ln -sf arch-x86 arch)
        @$(MAKEBOOT) dep