merge with xen-unstable.hg

diff --cc linux-2.6-xen-sparse/arch/ia64/Kconfig
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
index ae1131c00a884a62f63d3ef3d2f44893df65c20a,afc6b542d4153e43df70b0c389d6f8bde90e7335..877f354ad992e9038392827a207ff52f6861d7c5
--- 1/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
--- 2/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
@@@ -10,8 -10,14 +10,3 @@@
  #eventually asm-xsi-offsets needs to be part of hypervisor.h/hypercall.h
  ln -sf ../../../../xen/include/asm-ia64/asm-xsi-offsets.h include/asm-ia64/xen/
  
- #ia64 drivers/xen isn't fully functional yet, workaround...
- #also ignore core/evtchn.c which uses a different irq mechanism than ia64
- #(warning: there be dragons here if these files diverge)
- ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile
- ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile
 -#not sure where these ia64-specific files will end up in the future
 -ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core
 -
 -#still a few x86-ism's in various drivers/xen files, patch them
 -#cd drivers/xen
 -#if [ ! -e ia64.patch.semaphore ]
 -#then
 -#     cat ../../arch/ia64/xen/drivers/patches/* | patch -p1 -b
 -#fi
 -#touch ia64.patch.semaphore
 -#cd ../..

diff --cc linux-2.6-xen-sparse/arch/ia64/xen/drivers/README
index 33aecaa2a81b806c1de4394eed19083fd65a637f,33aecaa2a81b806c1de4394eed19083fd65a637f..0000000000000000000000000000000000000000
deleted file mode 100644,100644
--- 1/linux-2.6-xen-sparse/arch/ia64/xen/drivers/README
--- 2/linux-2.6-xen-sparse/arch/ia64/xen/drivers/README
+++ /dev/null
@@@ -1,2 -1,2 +1,0 @@@
--This is a temporary location for source/Makefiles that need to be
--patched/reworked in drivers/xen to work with xenlinux/ia64.

diff --cc linux-2.6-xen-sparse/include/asm-ia64/page.h
Simple merge

diff --cc tools/libxc/xc_ia64_stubs.c
Simple merge

diff --cc xen/arch/ia64/xen/domain.c
Simple merge

diff --cc xen/arch/ia64/xen/xensetup.c
Simple merge

diff --cc xen/include/public/arch-ia64.h
Simple merge