Merge with Linux 2.4.0-test5-pre3.
commit168660f24dfc46c2702acbe4701a446f42a59578
authorRalf Baechle <ralf@linux-mips.org>
Fri, 21 Jul 2000 22:00:56 +0000 (21 22:00 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 21 Jul 2000 22:00:56 +0000 (21 22:00 +0000)
treef431368afbf6b1b71809cf3fd904d800ea126f4d
parent6420f767924fa73b0ea267864d96820815f4ba5a
Merge with Linux 2.4.0-test5-pre3.
360 files changed:
CREDITS
Documentation/Configure.help
Documentation/fb/00-INDEX
Documentation/i386/boot.txt [new file with mode: 0644]
Documentation/joystick-api.txt
Documentation/joystick.txt
Documentation/usb/ov511.txt
Documentation/usb/usb-serial.txt
Documentation/video4linux/bttv/CARDLIST
Documentation/video4linux/bttv/CONTRIBUTORS
Documentation/video4linux/bttv/Insmod-options
MAINTAINERS
Makefile
README
arch/alpha/boot/Makefile
arch/alpha/config.in
arch/alpha/kernel/core_cia.c
arch/alpha/kernel/core_titan.c
arch/alpha/kernel/irq_alpha.c
arch/alpha/kernel/osf_sys.c
arch/alpha/kernel/pci.c
arch/alpha/kernel/setup.c
arch/alpha/kernel/sys_cabriolet.c
arch/alpha/kernel/sys_dp264.c
arch/alpha/kernel/sys_eb64p.c
arch/alpha/kernel/sys_noritake.c
arch/arm/Makefile
arch/arm/boot/compressed/Makefile
arch/arm/boot/compressed/head-sa1100.S
arch/arm/boot/compressed/setup-sa1100.S [new file with mode: 0644]
arch/arm/config.in
arch/arm/kernel/Makefile
arch/arm/kernel/arch.c
arch/arm/kernel/armksyms.c
arch/arm/kernel/bios32.c
arch/arm/kernel/dma-a5k.c [deleted file]
arch/arm/kernel/dma-arc.c
arch/arm/kernel/dma-dummy.c [deleted file]
arch/arm/kernel/dma-footbridge.c
arch/arm/kernel/dma-isa.c
arch/arm/kernel/dma-isa.h [deleted file]
arch/arm/kernel/dma-rpc.c
arch/arm/kernel/dma.c
arch/arm/kernel/dma.h
arch/arm/kernel/ecard.c
arch/arm/kernel/hw-sa1100.c
arch/arm/kernel/oldlatches.c
arch/arm/kernel/process.c
arch/arm/kernel/signal.c
arch/arm/kernel/sys_arm.c
arch/arm/kernel/time.c
arch/arm/kernel/traps.c
arch/arm/lib/Makefile
arch/arm/mm/init.c
arch/arm/mm/mm-sa1100.c
arch/arm/vmlinux-armo.lds.in
arch/arm/vmlinux-armv.lds.in
arch/i386/boot/bootsect.S
arch/i386/boot/setup.S
arch/i386/kernel/acpi.c
arch/i386/kernel/apm.c
arch/i386/kernel/i8259.c
arch/i386/kernel/io_apic.c
arch/i386/kernel/irq.c
arch/i386/kernel/traps.c
arch/i386/lib/Makefile
arch/ia64/kernel/irq.c
arch/mips/baget/vacserial.c
arch/mips/defconfig-cobalt
arch/ppc/kernel/pci.c
arch/ppc/kernel/pmac_backlight.c
arch/ppc/kernel/pmac_setup.c
arch/ppc/kernel/ppc_ksyms.c
arch/ppc/kernel/syscalls.c
arch/s390/kernel/irq.c
arch/sparc/Makefile
arch/sparc/kernel/Makefile
arch/sparc/kernel/check_asm.sh
arch/sparc/kernel/irq.c
arch/sparc/kernel/sun4d_irq.c
arch/sparc/mm/hypersparc.S
arch/sparc/mm/swift.S
arch/sparc/mm/tsunami.S
arch/sparc/mm/viking.S
arch/sparc64/Makefile
arch/sparc64/kernel/Makefile
arch/sparc64/kernel/check_asm.sh
arch/sparc64/kernel/sys_sparc32.c
arch/sparc64/kernel/systbls.S
arch/sparc64/lib/blockops.S
arch/sparc64/solaris/socksys.c
drivers/acorn/block/fd1772.c
drivers/acorn/char/Makefile
drivers/atm/zatm.c
drivers/block/elevator.c
drivers/block/floppy.c
drivers/block/ll_rw_blk.c
drivers/block/md.c
drivers/block/raid1.c
drivers/block/raid5.c
drivers/cdrom/cdu31a.c
drivers/cdrom/cm206.c
drivers/cdrom/gscd.c
drivers/cdrom/mcd.c
drivers/cdrom/mcdx.c
drivers/cdrom/sbpcd.c
drivers/cdrom/sonycd535.c
drivers/char/Makefile
drivers/char/amiserial.c
drivers/char/bt848.h
drivers/char/bttv-cards.c [new file with mode: 0644]
drivers/char/bttv-driver.c [moved from drivers/char/bttv.c with 71% similarity]
drivers/char/bttv-if.c [new file with mode: 0644]
drivers/char/bttv.h
drivers/char/console.c
drivers/char/drm/ffb_drv.c
drivers/char/drm/memory.c
drivers/char/epca.c
drivers/char/ftape/lowlevel/ftape-tracing.h
drivers/char/ftape/lowlevel/ftape_syms.c
drivers/char/ftape/zftape/zftape_syms.c
drivers/char/istallion.c
drivers/char/lp.c
drivers/char/msp3400.c
drivers/char/random.c
drivers/char/serial.c
drivers/char/stallion.c
drivers/char/synclink.c
drivers/char/tty_io.c
drivers/char/tuner.c
drivers/char/tvmixer.c
drivers/char/videodev.c
drivers/char/vt.c
drivers/ide/ide-cd.c
drivers/isdn/avmb1/avm_cs.c
drivers/isdn/isdn_tty.c
drivers/mtd/mtdram.c
drivers/net/3c523.c
drivers/net/3c527.c
drivers/net/aironet4500_card.c
drivers/net/appletalk/cops.c
drivers/net/appletalk/ipddp.c
drivers/net/defxx.c
drivers/net/depca.c
drivers/net/eepro.c
drivers/net/fc/iph5526.c
drivers/net/hamradio/dmascc.c
drivers/net/hamradio/soundmodem/sm_sbc.c
drivers/net/hamradio/soundmodem/sm_wss.c
drivers/net/hp100.c
drivers/net/ibmlana.c
drivers/net/pcmcia/aironet4500_cs.c
drivers/net/pcmcia/com20020_cs.c
drivers/net/pcmcia/ray_cs.c
drivers/net/sb1000.c
drivers/net/sk_mca.c
drivers/net/skeleton.c
drivers/net/smc9194.c
drivers/net/tokenring/ibmtr.c
drivers/net/tokenring/lanstreamer.c
drivers/net/tokenring/olympic.c
drivers/net/tokenring/smctr.c
drivers/net/wavelan.c
drivers/s390/char/con3215.c
drivers/sbus/audio/audio.c
drivers/sbus/char/flash.c
drivers/sbus/char/openprom.c
drivers/sbus/char/pcikbd.c
drivers/sbus/char/rtc.c
drivers/sbus/char/vfc_dev.c
drivers/scsi/scsi_scan.c
drivers/scsi/sr.c
drivers/sound/cmpci.c
drivers/sound/es1370.c
drivers/sound/es1371.c
drivers/sound/esssolo1.c
drivers/sound/maestro.c
drivers/sound/nm256_audio.c
drivers/sound/sonicvibes.c
drivers/usb/Config.in
drivers/usb/microtek.c
drivers/usb/ov511.c
drivers/usb/serial/keyspan.c
drivers/usb/serial/keyspan.h [copied from drivers/usb/serial/keyspan.c with 61% similarity]
drivers/usb/serial/keyspan_usa28msg.h
drivers/usb/usb.c
drivers/video/aty128fb.c
drivers/video/cyber2000fb.c
drivers/video/fbmem.c
drivers/video/matrox/matroxfb_base.c
drivers/video/pm2fb.c
drivers/video/sa1100fb.c
drivers/video/sisfb.c
drivers/video/vesafb.c
fs/binfmt_elf.c
fs/buffer.c
fs/ext2/file.c
fs/ext2/super.c
fs/fat/dir.c
fs/fat/inode.c
fs/hpfs/buffer.c
fs/isofs/inode.c
fs/isofs/joliet.c
fs/jffs/jffs_fm.c
fs/msdos/namei.c
fs/namei.c
fs/ncpfs/ncplib_kernel.c
fs/nfsd/nfssvc.c
fs/nfsd/stats.c
fs/nls/Config.in
fs/nls/Makefile
fs/nls/nls_base.c
fs/nls/nls_big5.c [new file with mode: 0644]
fs/nls/nls_cp437.c
fs/nls/nls_cp737.c
fs/nls/nls_cp775.c
fs/nls/nls_cp850.c
fs/nls/nls_cp852.c
fs/nls/nls_cp855.c
fs/nls/nls_cp857.c
fs/nls/nls_cp860.c
fs/nls/nls_cp861.c
fs/nls/nls_cp862.c
fs/nls/nls_cp863.c
fs/nls/nls_cp864.c
fs/nls/nls_cp865.c
fs/nls/nls_cp866.c
fs/nls/nls_cp869.c
fs/nls/nls_cp874.c
fs/nls/nls_cp932.c [new file with mode: 0644]
fs/nls/nls_cp936.c [new file with mode: 0644]
fs/nls/nls_cp949.c [new file with mode: 0644]
fs/nls/nls_cp950.c [new file with mode: 0644]
fs/nls/nls_euc-jp.c [new file with mode: 0644]
fs/nls/nls_euc-kr.c [new file with mode: 0644]
fs/nls/nls_gb2312.c [new file with mode: 0644]
fs/nls/nls_iso8859-1.c
fs/nls/nls_iso8859-14.c
fs/nls/nls_iso8859-15.c
fs/nls/nls_iso8859-2.c
fs/nls/nls_iso8859-3.c
fs/nls/nls_iso8859-4.c
fs/nls/nls_iso8859-5.c
fs/nls/nls_iso8859-6.c
fs/nls/nls_iso8859-7.c
fs/nls/nls_iso8859-8.c
fs/nls/nls_iso8859-9.c
fs/nls/nls_koi8-r.c
fs/nls/nls_sjis.c [new file with mode: 0644]
fs/nls/nls_utf8.c [new file with mode: 0644]
fs/ntfs/fs.c
fs/ntfs/support.c
fs/partitions/Makefile
fs/partitions/msdos.c
fs/qnx4/inode.c
fs/select.c
fs/smbfs/ChangeLog [new file with mode: 0644]
fs/smbfs/Makefile
fs/smbfs/cache.c
fs/smbfs/dir.c
fs/smbfs/file.c
fs/smbfs/inode.c
fs/smbfs/ioctl.c
fs/smbfs/proc.c
fs/smbfs/smb_debug.h [new file with mode: 0644]
fs/smbfs/sock.c
fs/vfat/namei.c
include/asm-alpha/pci.h
include/asm-arm/arch-arc/dma.h
include/asm-arm/arch-arc/hardware.h
include/asm-arm/arch-arc/ide.h
include/asm-arm/arch-arc/oldlatches.h
include/asm-arm/arch-arc/system.h
include/asm-arm/arch-cl7500/dma.h
include/asm-arm/arch-cl7500/system.h
include/asm-arm/arch-ebsa110/dma.h [copied from include/asm-arm/arch-sa1100/dma.h with 53% similarity]
include/asm-arm/arch-ebsa110/system.h
include/asm-arm/arch-ebsa285/system.h
include/asm-arm/arch-l7200/dma.h
include/asm-arm/arch-l7200/system.h
include/asm-arm/arch-nexuspci/dma.h
include/asm-arm/arch-nexuspci/system.h
include/asm-arm/arch-rpc/dma.h
include/asm-arm/arch-rpc/system.h
include/asm-arm/arch-sa1100/SA-1100.h [new file with mode: 0644]
include/asm-arm/arch-sa1100/SA-1101.h [new file with mode: 0644]
include/asm-arm/arch-sa1100/SA-1111.h [new file with mode: 0644]
include/asm-arm/arch-sa1100/bitfield.h [new file with mode: 0644]
include/asm-arm/arch-sa1100/bitsy.h [new file with mode: 0644]
include/asm-arm/arch-sa1100/dma.h
include/asm-arm/arch-sa1100/hardware.h
include/asm-arm/arch-sa1100/ide.h
include/asm-arm/arch-sa1100/io.h
include/asm-arm/arch-sa1100/irq.h
include/asm-arm/arch-sa1100/keyboard.h
include/asm-arm/arch-sa1100/system.h
include/asm-arm/arch-sa1100/thinclient.h [new file with mode: 0644]
include/asm-arm/arch-sa1100/uncompress.h
include/asm-arm/arch-shark/system.h
include/asm-arm/dec21285.h
include/asm-arm/dma.h
include/asm-arm/system.h
include/asm-arm/unaligned.h
include/asm-i386/hardirq.h
include/asm-ia64/hardirq.h
include/asm-ia64/ia32.h
include/asm-ia64/pgtable.h
include/asm-mips/hardirq.h
include/asm-ppc/hardirq.h
include/asm-ppc/machdep.h
include/asm-sparc/asm_offsets.h [deleted file]
include/asm-sparc/bitops.h
include/asm-sparc/pgtsrmmu.h
include/asm-sparc64/asm_offsets.h [deleted file]
include/linux/acpi.h
include/linux/coda_linux.h
include/linux/elevator.h
include/linux/fs.h
include/linux/hfs_sysdep.h
include/linux/msdos_fs_sb.h
include/linux/ncp_fs.h
include/linux/nfsd/stats.h
include/linux/nls.h
include/linux/pm.h
include/linux/raid/md.h
include/linux/slab.h
include/linux/smb_fs.h
include/linux/timer.h
include/net/sock.h
kernel/sys.c
kernel/timer.c
mm/page_alloc.c
mm/vmscan.c
net/802/p8022.c
net/802/p8023.c
net/802/psnap.c
net/802/tr.c
net/appletalk/aarp.c
net/appletalk/ddp.c
net/core/dev_mcast.c
net/core/netfilter.c
net/core/sock.c
net/decnet/dn_dev.c
net/decnet/dn_table.c
net/ethernet/pe2.c
net/ipv4/devinet.c
net/ipv4/igmp.c
net/ipv4/ip_options.c
net/ipv4/ip_sockglue.c
net/ipv4/ipconfig.c
net/ipv4/netfilter/ipfwadm_core.c
net/ipv4/netfilter/ipt_REJECT.c
net/ipv4/syncookies.c
net/ipv4/tcp_ipv4.c
net/ipv6/mcast.c
net/ipx/af_ipx.c
net/packet/af_packet.c
net/socket.c
net/sunrpc/xprt.c
net/unix/af_unix.c