bitkeeper revision 1.1236.6.1 (42265e38FOWXHddB1NPxV83mnMxy7Q)
authordjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Thu, 3 Mar 2005 00:45:44 +0000 (00:45 +0000)
committerdjm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Thu, 3 Mar 2005 00:45:44 +0000 (00:45 +0000)
Merge kirby.fc.hp.com:/home/djm/src/xen/xeno-unstable-ia64.bk
into kirby.fc.hp.com:/home/djm/src/xen/useraccess.bk

1  2 
xen/arch/ia64/xensetup.c

Simple merge