Rest of the merge.
commit478add0ea718dee38702c066907a510525964b48
authorRalf Baechle <ralf@linux-mips.org>
Tue, 7 Mar 2000 16:02:18 +0000 (7 16:02 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 7 Mar 2000 16:02:18 +0000 (7 16:02 +0000)
treedb719e8441d2c0bf223a6f86b36a5a25772957bd
parent9f9f3e6e8548a596697778337110a423c384b6f3
Rest of the merge.
31 files changed:
Documentation/usb/rio.txt [new file with mode: 0644]
arch/alpha/kernel/irq_alpha.c [new file with mode: 0644]
arch/alpha/kernel/irq_i8259.c [new file with mode: 0644]
arch/alpha/kernel/irq_smp.c [new file with mode: 0644]
arch/alpha/kernel/irq_srm.c [new file with mode: 0644]
arch/arm/mm/mm-clps7500.c [new file with mode: 0644]
drivers/block/ide-cs.c [new file with mode: 0644]
drivers/char/digi1.h [new file with mode: 0644]
drivers/char/digiFep1.h [new file with mode: 0644]
drivers/char/digiPCI.h [new file with mode: 0644]
drivers/char/epca.h [new file with mode: 0644]
drivers/char/epcaconfig.h [new file with mode: 0644]
drivers/char/tuner-3036.c [new file with mode: 0644]
drivers/net/bonding.c [new file with mode: 0644]
drivers/usb/pegasus.c [new file with mode: 0644]
drivers/usb/rio500.c [new file with mode: 0644]
drivers/usb/rio500_usb.h [new file with mode: 0644]
drivers/usb/wacom.c [new file with mode: 0644]
drivers/video/riva/Makefile [new file with mode: 0644]
drivers/video/riva/fbdev.c [new file with mode: 0644]
drivers/video/riva/nv4ref.h [new file with mode: 0644]
drivers/video/riva/nvreg.h [new file with mode: 0644]
drivers/video/riva/riva_hw.c [new file with mode: 0644]
drivers/video/riva/riva_hw.h [new file with mode: 0644]
drivers/video/riva/riva_tbl.h [new file with mode: 0644]
include/asm-arm/arch-nexuspci/ide.h [new file with mode: 0644]
include/asm-arm/arch-nexuspci/keyboard.h [new file with mode: 0644]
include/linux/brlock.h [new file with mode: 0644]
include/linux/if_bonding.h [new file with mode: 0644]
include/linux/netfilter_ipv6.h [new file with mode: 0644]
lib/brlock.c [new file with mode: 0644]