Merge By hand
authorJames Bottomley <jejb@mulgrave.(none)>
Tue, 19 Mar 2002 05:47:38 +0000 (21:47 -0800)
committerJames Bottomley <jejb@mulgrave.(none)>
Tue, 19 Mar 2002 05:47:38 +0000 (21:47 -0800)
commit1fe1da9f2a5a3e49ffb7a8cc0eab25166ac5a1cc
tree37c5617205f339bf398f390abed37bec1641fab6
parent085c9a18acd4003fa77cf852aa770e52b2ce6a71
parentff627420d73fcbf75f21bb2b0ec84833073a475f
Merge By hand
arch/i386/config.in
arch/i386/generic/mpparse.c
arch/i386/generic/pci-irq.c
arch/i386/generic/pci-pc.c
arch/i386/kernel/Makefile
arch/i386/kernel/setup.c
arch/i386/kernel/smpboot.c
arch/i386/kernel/traps.c