Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux-2.5-pci
authorLinus Torvalds <torvalds@penguin.transmeta.com>
Wed, 8 May 2002 09:10:48 +0000 (02:10 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Wed, 8 May 2002 09:10:48 +0000 (02:10 -0700)
commit4ce6b618012e4649b858bf2884f7fa060aee692b
treef5456df4e0c38a79ac1e69595e5f8a34e6bbf502
parent14231ee7e7c683c703c77c0ea7a71b674bb2b467
parentce46ece92f009ce014ae9fc0867bf3ab06c17c35
Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux-2.5-pci
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Makefile
arch/i386/kernel/Makefile
arch/i386/pci/fixup.c
arch/i386/pci/i386.c
arch/i386/pci/irq.c