Merge with -unstable

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

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

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

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

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