Merge
authorJames Bottomley <jejb@mulgrave.(none)>
Tue, 23 Apr 2002 05:09:03 +0000 (00:09 -0500)
committerJames Bottomley <jejb@mulgrave.(none)>
Tue, 23 Apr 2002 05:09:03 +0000 (00:09 -0500)
commit4d54e4a3768af5bffe5f0d944adf814d21e94d12
treed57e067355afd351af32233cbb0c197afa3d8850
parent45fbecb1147007167ea78399f165ceae775d86e7
parent2227534a8cb17cd70abbd21f52279c54a18019f2
Merge
arch/i386/config.in
arch/i386/generic/mpparse.c
arch/i386/generic/pci-pc.c
arch/i386/kernel/process.c
arch/i386/kernel/setup.c
arch/i386/kernel/traps.c