Merge mulgrave.(none):/home/jejb/BK/linux-2.5
authorJames Bottomley <jejb@mulgrave.(none)>
Mon, 11 Mar 2002 13:12:59 +0000 (08:12 -0500)
committerJames Bottomley <jejb@mulgrave.(none)>
Mon, 11 Mar 2002 13:12:59 +0000 (08:12 -0500)
commitff627420d73fcbf75f21bb2b0ec84833073a475f
tree5d03970d55a6a2fdaf46dd49b662c0fa66b39b85
parent50b1b006812d8642e02df5c661bf53d8752b4403
parent1eb6e582b7e66c95e40a22caf2dec8ec9f463a8e
Merge mulgrave.(none):/home/jejb/BK/linux-2.5
into mulgrave.(none):/home/jejb/BK/abstract-i386-2.5
arch/i386/generic/mpparse.c
arch/i386/generic/pci-pc.c
arch/i386/kernel/Makefile
arch/i386/kernel/smpboot.c
arch/i386/kernel/time.c
arch/i386/kernel/traps.c