Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5
authorDavid Mosberger <davidm@tiger.hpl.hp.com>
Thu, 23 May 2002 10:24:26 +0000 (03:24 -0700)
committerDavid Mosberger <davidm@tiger.hpl.hp.com>
Thu, 23 May 2002 10:24:26 +0000 (03:24 -0700)
commit76f0f1f3e86db033ac707caf42ea97ababc15484
tree734b6377db052e80952e55dd8453dc4e294ecfb2
parente6d19c6ab5f0f54d15277be9933183050d01ce2c
parent86d6792a9513d44de3a16298a869c82a45e21bbf
Merge tiger.hpl.hp.com:/data1/bk/vanilla/linux-2.5
into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5
arch/ia64/config.in
arch/ia64/kernel/efi.c
arch/ia64/mm/init.c
arch/ia64/sn/kernel/misctest.c
arch/ia64/vmlinux.lds.S