Merge with Linux 2.3.99-pre5.
commit7f974a7687129917e3c3ceb74287bdf9ba0fd5f3
authorRalf Baechle <ralf@linux-mips.org>
Wed, 19 Apr 2000 13:55:33 +0000 (19 13:55 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 19 Apr 2000 13:55:33 +0000 (19 13:55 +0000)
treee5a2ab040ca748a1d3e8f863af05b9f7ef674a76
parent46e045034336a2cc90c1798cd7cc07af744ddfd6
Merge with Linux 2.3.99-pre5.
12 files changed:
Makefile
arch/i386/kernel/Makefile
arch/i386/kernel/pci-i386.h
arch/i386/kernel/pci-irq.c [new file with mode: 0644]
arch/i386/kernel/pci-pc.c
drivers/net/Space.c
drivers/pci/pci.c
drivers/usb/usb.c
fs/namei.c
fs/nfs/inode.c
include/linux/pci.h
include/linux/usb.h