ia64: Fix misc. merge errors and typos.
authorDavid Mosberger <davidm@tiger.hpl.hp.com>
Fri, 3 May 2002 04:52:26 +0000 (21:52 -0700)
committerDavid Mosberger <davidm@wailua.hpl.hp.com>
Fri, 3 May 2002 04:52:26 +0000 (21:52 -0700)
commit52177532bc0a0162f140b88fcbc169af6c9c984d
tree3dccc453bbbe08964cc74077f366d70a561cecc9
parent55fa11c55e2e45590d75cddfcd1bd6f87d130cca
ia64: Fix misc. merge errors and typos.
arch/ia64/hp/common/Makefile
arch/ia64/hp/sim/simserial.c
arch/ia64/hp/zx1/hpzx1_misc.c
arch/ia64/kernel/iosapic.c
include/asm-ia64/efi.h