Merge
authorJames Bottomley <jejb@mulgrave.(none)>
Thu, 16 May 2002 06:15:25 +0000 (02:15 -0400)
committerJames Bottomley <jejb@mulgrave.(none)>
Thu, 16 May 2002 06:15:25 +0000 (02:15 -0400)
commit3c2716a19b478553df1ba5a49343898850566cb9
tree23dafd34eb129a194ab0c679e64baf580082da7f
parent4cc4c6970e6573cc6a671f44de95097217a2be50
parent5ae7af015dabb86d5fc073fffa1fadb52a5333ec
Merge
arch/i386/kernel/process.c
arch/i386/kernel/setup.c
arch/i386/kernel/smpboot.c
arch/i386/pci/Makefile