Merge by hand
authorJames Bottomley <jejb@mulgrave.(none)>
Tue, 7 May 2002 10:11:58 +0000 (05:11 -0500)
committerJames Bottomley <jejb@mulgrave.(none)>
Tue, 7 May 2002 10:11:58 +0000 (05:11 -0500)
commitcad751cb643fc41ae118aacaa35e55e13b5bd331
tree6870ca40c5ded8e9f566112929d2a61b27e6758f
parent702d27c75ce9c624d4015ea61d1cec85e9d140a9
parent1dc866647e4b8dbc345e1322ff086b273dd7aca1
Merge by hand
arch/i386/config.in
arch/i386/generic/mpparse.c
arch/i386/generic/pci-pc.c
arch/i386/kernel/apic.c
arch/i386/kernel/entry.S
arch/i386/kernel/i8259.c
arch/i386/kernel/process.c
arch/i386/kernel/setup.c