Merge mulgrave.(none):/home/jejb/BK/linux-2.5
authorJames Bottomley <jejb@mulgrave.(none)>
Fri, 10 May 2002 17:34:00 +0000 (13:34 -0400)
committerJames Bottomley <jejb@mulgrave.(none)>
Fri, 10 May 2002 17:34:00 +0000 (13:34 -0400)
commit63de5be5cc72de58923729dc9b7ad59e79084926
tree9a5b4bb2070e4ddc2820f6af27653530fd94751d
parent89ded761926f49277d376b6b2a9c790d0e7343b3
parent4ce6b618012e4649b858bf2884f7fa060aee692b
Merge mulgrave.(none):/home/jejb/BK/linux-2.5
into mulgrave.(none):/home/jejb/BK/arch-split-2.5
arch/i386/Makefile
arch/i386/kernel/Makefile
arch/i386/pci/Makefile