merge with xen-unstable.hg

diff --cc buildconfigs/linux-defconfig_xen0_ia64
index 782c1f492574afde70e846e0a73974c42b1f3f03,84fa7c7abb923c3e265370920025c6823b6d7221..9869aab06626a514c8a582c7b3a31494c0d57344
--- 1/buildconfigs/linux-defconfig_xen0_ia64
--- 2/buildconfigs/linux-defconfig_xen0_ia64
+++ b/buildconfigs/linux-defconfig_xen0_ia64
@@@ -1639,10 -1536,9 +1639,10 @@@ CONFIG_XEN_PCIDEV_BACKEND=
  # CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
  CONFIG_XEN_PCIDEV_BACKEND_SLOT=y
  # CONFIG_XEN_PCIDEV_BE_DEBUG is not set
- # CONFIG_XEN_TPMDEV_BACKEND is not set
+ CONFIG_XEN_TPMDEV_BACKEND=m
  CONFIG_XEN_BLKDEV_FRONTEND=y
  CONFIG_XEN_NETDEV_FRONTEND=y
 +# CONFIG_XEN_FRAMEBUFFER is not set
  # CONFIG_XEN_SCRUB_PAGES is not set
  CONFIG_XEN_DISABLE_SERIAL=y
  CONFIG_XEN_SYSFS=y

diff --cc buildconfigs/linux-defconfig_xen_ia64
Simple merge

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

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

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