Merge
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Fri, 13 Jan 2006 20:12:24 +0000 (14:12 -0600)
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Fri, 13 Jan 2006 20:12:24 +0000 (14:12 -0600)
1  2 
xen/arch/ia64/xen/xensetup.c
xen/include/asm-ia64/config.h

Simple merge
Simple merge