Merge with 2.3.99-pre1.
commit8abb719409c9060a7c0676f76e9182c1e0b8ca46
authorRalf Baechle <ralf@linux-mips.org>
Sun, 19 Mar 2000 01:28:40 +0000 (19 01:28 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 19 Mar 2000 01:28:40 +0000 (19 01:28 +0000)
treeb88cc5a6cd513a04a512b7e6215c873c90a1c5dd
parentf01bd7aeafd95a08aafc9e3636bb26974df69d82
Merge with 2.3.99-pre1.
488 files changed:
CREDITS
Documentation/Configure.help
Documentation/DocBook/Makefile [new file with mode: 0644]
Documentation/DocBook/mcabook.tmpl [new file with mode: 0644]
Documentation/DocBook/parport-multi.fig [new file with mode: 0644]
Documentation/DocBook/parport-share.fig [new file with mode: 0644]
Documentation/DocBook/parport-structure.fig [new file with mode: 0644]
Documentation/DocBook/parportbook.sgml [new file with mode: 0644]
Documentation/DocBook/videobook.tmpl [new file with mode: 0644]
Documentation/DocBook/wanbook.tmpl [new file with mode: 0644]
Documentation/DocBook/z8530book.tmpl [new file with mode: 0644]
Documentation/networking/comx.txt [new file with mode: 0644]
Documentation/networking/dmfe.txt [new file with mode: 0644]
Documentation/sound/ALS [new file with mode: 0644]
Documentation/sound/Maestro
Documentation/usb/ov511.txt
Documentation/video4linux/CQcam.txt [new file with mode: 0644]
Documentation/video4linux/bttv/README
MAINTAINERS
Makefile
arch/alpha/config.in
arch/alpha/defconfig
arch/arm/Makefile
arch/arm/boot/compressed/Makefile
arch/arm/config.in
arch/arm/defconfig
arch/arm/kernel/Makefile
arch/arm/kernel/arch.c [new file with mode: 0644]
arch/arm/kernel/arch.h [new file with mode: 0644]
arch/arm/kernel/armksyms.c
arch/arm/kernel/bios32.c
arch/arm/kernel/head-armv.S
arch/arm/kernel/ptrace.c
arch/arm/kernel/setup.c
arch/arm/lib/Makefile
arch/arm/lib/io-shark.c [new file with mode: 0644]
arch/arm/mm/init.c
arch/arm/mm/proc-arm6,7.S
arch/arm/vmlinux-armo.lds.in [copied from arch/arm/vmlinux-armv.lds.in with 80% similarity]
arch/arm/vmlinux-armv.lds.in
arch/i386/boot/tools/build.c
arch/i386/config.in
arch/i386/defconfig
arch/i386/kernel/Makefile
arch/i386/kernel/acpi.c
arch/i386/kernel/entry.S
arch/i386/kernel/head.S
arch/i386/kernel/i386_ksyms.c
arch/i386/kernel/irq.c
arch/i386/kernel/mca.c
arch/i386/kernel/mtrr.c
arch/i386/kernel/setup.c
arch/i386/kernel/time.c
arch/i386/lib/delay.c
arch/ia64/config.in
arch/ia64/defconfig
arch/m68k/config.in
arch/m68k/defconfig
arch/mips/arc/init.c
arch/mips/config.in
arch/mips/defconfig
arch/mips/defconfig-ip22
arch/mips/kernel/irixelf.c
arch/mips/kernel/syscalls.h
arch/mips64/config.in
arch/mips64/defconfig
arch/mips64/defconfig-ip27
arch/mips64/kernel/scall_64.S
arch/mips64/kernel/scall_o32.S
arch/ppc/config.in
arch/ppc/defconfig
arch/sh/config.in
arch/sh/defconfig
arch/sparc/boot/piggyback.c
arch/sparc/config.in
arch/sparc/defconfig
arch/sparc/kernel/sys_solaris.c
arch/sparc/kernel/sys_sunos.c
arch/sparc/kernel/systbls.S
arch/sparc64/config.in
arch/sparc64/defconfig
arch/sparc64/kernel/binfmt_aout32.c
arch/sparc64/kernel/ioctl32.c
arch/sparc64/kernel/sys_sparc32.c
arch/sparc64/kernel/sys_sunos32.c
arch/sparc64/kernel/systbls.S
arch/sparc64/solaris/misc.c
arch/sparc64/solaris/systbl.S
drivers/Makefile
drivers/block/Config.in
drivers/block/DAC960.c
drivers/block/Makefile
drivers/block/blkpg.c
drivers/block/elevator.c [new file with mode: 0644]
drivers/block/ll_rw_blk.c
drivers/cdrom/aztcd.c
drivers/char/Config.in
drivers/char/bttv.c
drivers/char/bttv.h
drivers/char/console.c
drivers/char/drm/auth.c
drivers/char/drm/bufs.c
drivers/char/drm/context.c
drivers/char/drm/dma.c
drivers/char/drm/drawable.c
drivers/char/drm/drm.h
drivers/char/drm/drmP.h
drivers/char/drm/fops.c
drivers/char/drm/gamma_dma.c
drivers/char/drm/gamma_drv.c
drivers/char/drm/gamma_drv.h
drivers/char/drm/init.c
drivers/char/drm/ioctl.c
drivers/char/drm/lists.c
drivers/char/drm/lock.c
drivers/char/drm/memory.c
drivers/char/drm/proc.c
drivers/char/drm/tdfx_context.c
drivers/char/drm/tdfx_drv.c
drivers/char/drm/tdfx_drv.h
drivers/char/drm/vm.c
drivers/char/generic_serial.c
drivers/char/mem.c
drivers/char/misc.c
drivers/char/mixcomwd.c
drivers/char/n_tty.c
drivers/char/ppdev.c
drivers/char/pty.c
drivers/char/radio-gemtek.c
drivers/char/serial.c
drivers/char/sx.c
drivers/char/sx.h
drivers/char/sxboards.h
drivers/char/tty_io.c
drivers/char/videodev.c
drivers/ide/Config.in [new file with mode: 0644]
drivers/ide/Makefile [copied from drivers/block/Makefile with 56% similarity]
drivers/ide/aec6210.c [moved from drivers/block/aec6210.c with 100% similarity]
drivers/ide/ali14xx.c [moved from drivers/block/ali14xx.c with 100% similarity]
drivers/ide/alim15x3.c [moved from drivers/block/alim15x3.c with 100% similarity]
drivers/ide/amd7409.c [moved from drivers/block/amd7409.c with 100% similarity]
drivers/ide/buddha.c [moved from drivers/block/buddha.c with 100% similarity]
drivers/ide/cmd640.c [moved from drivers/block/cmd640.c with 100% similarity]
drivers/ide/cmd64x.c [moved from drivers/block/cmd64x.c with 100% similarity]
drivers/ide/cs5530.c [moved from drivers/block/cs5530.c with 100% similarity]
drivers/ide/cy82c693.c [moved from drivers/block/cy82c693.c with 100% similarity]
drivers/ide/dtc2278.c [moved from drivers/block/dtc2278.c with 100% similarity]
drivers/ide/falconide.c [moved from drivers/block/falconide.c with 100% similarity]
drivers/ide/gayle.c [moved from drivers/block/gayle.c with 100% similarity]
drivers/ide/hd.c [moved from drivers/block/hd.c with 100% similarity]
drivers/ide/hpt34x.c [moved from drivers/block/hpt34x.c with 100% similarity]
drivers/ide/hpt366.c [moved from drivers/block/hpt366.c with 100% similarity]
drivers/ide/ht6560b.c [moved from drivers/block/ht6560b.c with 100% similarity]
drivers/ide/icside.c [moved from drivers/block/icside.c with 100% similarity]
drivers/ide/ide-cd.c [moved from drivers/block/ide-cd.c with 100% similarity]
drivers/ide/ide-cd.h [moved from drivers/block/ide-cd.h with 100% similarity]
drivers/ide/ide-cs.c [moved from drivers/block/ide-cs.c with 100% similarity]
drivers/ide/ide-disk.c [moved from drivers/block/ide-disk.c with 100% similarity]
drivers/ide/ide-dma.c [moved from drivers/block/ide-dma.c with 100% similarity]
drivers/ide/ide-features.c [moved from drivers/block/ide-features.c with 100% similarity]
drivers/ide/ide-floppy.c [moved from drivers/block/ide-floppy.c with 99% similarity]
drivers/ide/ide-geometry.c [moved from drivers/block/ide-geometry.c with 100% similarity]
drivers/ide/ide-pci.c [moved from drivers/block/ide-pci.c with 100% similarity]
drivers/ide/ide-pmac.c [moved from drivers/block/ide-pmac.c with 100% similarity]
drivers/ide/ide-pnp.c [moved from drivers/block/ide-pnp.c with 100% similarity]
drivers/ide/ide-probe.c [moved from drivers/block/ide-probe.c with 100% similarity]
drivers/ide/ide-proc.c [moved from drivers/block/ide-proc.c with 100% similarity]
drivers/ide/ide-tape.c [moved from drivers/block/ide-tape.c with 100% similarity]
drivers/ide/ide.c [moved from drivers/block/ide.c with 99% similarity]
drivers/ide/ide_modes.h [moved from drivers/block/ide_modes.h with 100% similarity]
drivers/ide/macide.c [moved from drivers/block/macide.c with 100% similarity]
drivers/ide/ns87415.c [moved from drivers/block/ns87415.c with 100% similarity]
drivers/ide/opti621.c [moved from drivers/block/opti621.c with 100% similarity]
drivers/ide/pdc202xx.c [moved from drivers/block/pdc202xx.c with 100% similarity]
drivers/ide/pdc4030.c [moved from drivers/block/pdc4030.c with 100% similarity]
drivers/ide/pdc4030.h [moved from drivers/block/pdc4030.h with 100% similarity]
drivers/ide/piix.c [moved from drivers/block/piix.c with 100% similarity]
drivers/ide/q40ide.c [moved from drivers/block/q40ide.c with 100% similarity]
drivers/ide/qd6580.c [moved from drivers/block/qd6580.c with 100% similarity]
drivers/ide/rapide.c [moved from drivers/block/rapide.c with 100% similarity]
drivers/ide/rz1000.c [moved from drivers/block/rz1000.c with 100% similarity]
drivers/ide/sis5513.c [moved from drivers/block/sis5513.c with 100% similarity]
drivers/ide/sl82c105.c [moved from drivers/block/sl82c105.c with 100% similarity]
drivers/ide/trm290.c [moved from drivers/block/trm290.c with 100% similarity]
drivers/ide/umc8672.c [moved from drivers/block/umc8672.c with 100% similarity]
drivers/ide/via82cxxx.c [moved from drivers/block/via82cxxx.c with 100% similarity]
drivers/net/3c527.c
drivers/net/3c59x.c
drivers/net/Config.in
drivers/net/aironet4500.h
drivers/net/appletalk/Config.in
drivers/net/bsd_comp.c
drivers/net/dgrs.c
drivers/net/dmfe.c
drivers/net/eexpress.c
drivers/net/epic100.c
drivers/net/eql.c
drivers/net/ewrk3.c
drivers/net/hamradio/baycom_epp.c
drivers/net/hamradio/baycom_par.c
drivers/net/hamradio/baycom_ser_fdx.c
drivers/net/hamradio/baycom_ser_hdx.c
drivers/net/hamradio/bpqether.c
drivers/net/hamradio/hdlcdrv.c
drivers/net/hamradio/pi2.c
drivers/net/hamradio/pt.c
drivers/net/hamradio/scc.c
drivers/net/hamradio/soundmodem/sm.c
drivers/net/hamradio/soundmodem/sm_sbc.c
drivers/net/hamradio/soundmodem/sm_wss.c
drivers/net/hamradio/yam.c
drivers/net/lance.c
drivers/net/pcmcia/3c574_cs.c
drivers/net/pcmcia/Config.in
drivers/net/pcmcia/Makefile
drivers/net/pcmcia/ray_cs.c
drivers/net/pcmcia/tulip_cb.c [deleted file]
drivers/net/pcnet32.c
drivers/net/plip.c
drivers/net/ppp_async.c
drivers/net/ppp_deflate.c
drivers/net/ppp_generic.c
drivers/net/ppp_synctty.c
drivers/net/rcpci45.c
drivers/net/rrunner.c
drivers/net/sb1000.c
drivers/net/setup.c
drivers/net/shaper.c
drivers/net/sis900.c
drivers/net/skfp/drvfbi.c
drivers/net/skfp/skfddi.c
drivers/net/sunhme.c
drivers/net/tokenring/Config.in
drivers/net/tokenring/Makefile
drivers/net/tokenring/lanstreamer.c [new file with mode: 0644]
drivers/net/tokenring/lanstreamer.h [new file with mode: 0644]
drivers/net/via-rhine.c
drivers/net/wan/Config.in
drivers/net/wan/Makefile
drivers/net/wan/comx-hw-comx.c [new file with mode: 0644]
drivers/net/wan/comx-hw-locomx.c [new file with mode: 0644]
drivers/net/wan/comx-hw-mixcom.c [new file with mode: 0644]
drivers/net/wan/comx-proto-fr.c [new file with mode: 0644]
drivers/net/wan/comx-proto-lapb.c [new file with mode: 0644]
drivers/net/wan/comx-proto-ppp.c [new file with mode: 0644]
drivers/net/wan/comx.c [new file with mode: 0644]
drivers/net/wan/comx.h [new file with mode: 0644]
drivers/net/wan/comxhw.h [new file with mode: 0644]
drivers/net/wan/cosa.c
drivers/net/wan/hscx.h [new file with mode: 0644]
drivers/net/wan/mixcom.h [new file with mode: 0644]
drivers/net/wan/sbni.c
drivers/net/wan/sdla.c
drivers/net/wan/syncppp.c
drivers/net/wan/syncppp.h
drivers/net/wan/z85230.c
drivers/net/wavelan.c
drivers/net/wavelan.h
drivers/net/yellowfin.c
drivers/parport/ChangeLog
drivers/parport/Config.in
drivers/parport/parport_pc.c
drivers/pcmcia/yenta.c
drivers/sbus/audio/audio.c
drivers/sbus/char/sab82532.c
drivers/sbus/char/su.c
drivers/sbus/char/zs.c
drivers/scsi/ChangeLog.ncr53c8xx
drivers/scsi/ChangeLog.sym53c8xx
drivers/scsi/Config.in
drivers/scsi/README.st
drivers/scsi/atp870u.c
drivers/scsi/constants.c
drivers/scsi/eata_dma_proc.c
drivers/scsi/hosts.h
drivers/scsi/ncr53c8xx.c
drivers/scsi/scsi.c
drivers/scsi/scsi.h
drivers/scsi/scsi_debug.c
drivers/scsi/scsi_ioctl.c
drivers/scsi/scsi_lib.c
drivers/scsi/scsi_merge.c
drivers/scsi/scsi_scan.c
drivers/scsi/scsi_syms.c
drivers/scsi/sd.c
drivers/scsi/sr.c
drivers/scsi/st.c
drivers/scsi/st.h
drivers/scsi/st_options.h
drivers/scsi/sym53c8xx.c
drivers/scsi/sym53c8xx_comm.h [new file with mode: 0644]
drivers/sound/Config.in
drivers/sound/Makefile
drivers/sound/dev_table.c
drivers/sound/dev_table.h
drivers/sound/dmabuf.c
drivers/sound/miroaci.h
drivers/sound/mpu401.c
drivers/sound/sb_card.c
drivers/sound/sound_core.c
drivers/sound/sound_firmware.c
drivers/sound/soundcard.c
drivers/sound/waveartist.c
drivers/telephony/ixj.c
drivers/telephony/phonedev.c
drivers/usb/Config.in
drivers/usb/Makefile
drivers/usb/dsbr100.c [new file with mode: 0644]
drivers/usb/inode.c
drivers/usb/ov511.c
drivers/usb/ov511.h
drivers/usb/pegasus.c
drivers/usb/serial/Makefile
drivers/usb/uhci.c
drivers/usb/uhci.h
drivers/usb/usb-core.c
drivers/usb/usb-storage.c
drivers/usb/usb-storage.h
drivers/usb/usb-uhci-debug.h
drivers/usb/usb-uhci.c
drivers/usb/usb-uhci.h
drivers/video/aty128.h
drivers/video/aty128fb.c
drivers/video/atyfb.c
drivers/video/cyber2000fb.c
drivers/video/fbcon.c
drivers/video/fbmem.c
drivers/video/hgafb.c
fs/Config.in
fs/adfs/dir.c
fs/affs/super.c
fs/bfs/inode.c
fs/binfmt_aout.c
fs/binfmt_elf.c
fs/binfmt_em86.c
fs/binfmt_misc.c
fs/binfmt_script.c
fs/coda/psdev.c
fs/efs/super.c
fs/exec.c
fs/ext2/dir.c
fs/fat/fatfs_syms.c
fs/fat/inode.c
fs/filesystems.c
fs/hfs/super.c
fs/hpfs/buffer.c
fs/hpfs/hpfs_fn.h
fs/hpfs/inode.c
fs/hpfs/super.c
fs/isofs/inode.c
fs/minix/inode.c
fs/msdos/msdosfs_syms.c
fs/msdos/namei.c
fs/ncpfs/inode.c
fs/nfs/read.c
fs/nfsd/nfsfh.c
fs/nls/nls_base.c
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_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/ntfs/fs.c
fs/openpromfs/inode.c
fs/partitions/acorn.c
fs/partitions/acorn.h
fs/partitions/atari.c
fs/partitions/sgi.c
fs/proc/procfs_syms.c
fs/qnx4/inode.c
fs/romfs/inode.c
fs/smbfs/inode.c
fs/super.c
fs/sysv/inode.c
fs/udf/super.c
fs/ufs/dir.c
fs/ufs/super.c
fs/umsdos/inode.c
fs/vfat/namei.c
fs/vfat/vfatfs_syms.c
include/asm-alpha/parport.h
include/asm-arm/arch-cl7500/system.h
include/asm-arm/arch-ebsa285/time.h
include/asm-arm/parport.h
include/asm-arm/procinfo.h
include/asm-arm/ptrace.h
include/asm-arm/system.h
include/asm-i386/mca_dma.h
include/asm-i386/mman.h
include/asm-i386/parport.h
include/asm-i386/unistd.h
include/asm-mips/mman.h
include/asm-mips/parport.h
include/asm-mips/sgialib.h
include/asm-mips/unistd.h
include/asm-mips64/mman.h
include/asm-mips64/parport.h
include/asm-mips64/unistd.h
include/asm-sparc/ide.h
include/asm-sparc/vaddrs.h
include/asm-sparc64/parport.h
include/linux/affs_fs.h
include/linux/bfs_fs.h
include/linux/blk.h
include/linux/blkdev.h
include/linux/compatmac.h [new file with mode: 0644]
include/linux/efs_fs.h
include/linux/elevator.h [new file with mode: 0644]
include/linux/fb.h
include/linux/fs.h
include/linux/generic_serial.h [moved from drivers/char/generic_serial.h with 97% similarity]
include/linux/hfs_fs.h
include/linux/hpfs_fs.h
include/linux/if_ppp.h
include/linux/iso_fs.h
include/linux/kmod.h
include/linux/minix_fs.h
include/linux/mm.h
include/linux/mmzone.h
include/linux/msdos_fs.h
include/linux/ncp_fs.h
include/linux/nls.h
include/linux/ntfs_fs.h
include/linux/pci.h
include/linux/personality.h
include/linux/ppp_channel.h
include/linux/ppp_defs.h
include/linux/proc_fs.h
include/linux/qnx4_fs.h
include/linux/romfs_fs.h
include/linux/smb_fs.h
include/linux/swap.h
include/linux/sysv_fs.h
include/linux/telephony.h
include/linux/tty.h
include/linux/udf_fs.h
include/linux/ufs_fs.h
include/linux/umsdos_fs.h
include/linux/usb.h
ipc/shm.c
kernel/exec_domain.c
kernel/exit.c
kernel/fork.c
kernel/module.c
kernel/pm.c
mm/filemap.c
mm/mlock.c
mm/mmap.c
mm/mprotect.c
mm/mremap.c
mm/page_alloc.c
mm/vmscan.c
net/appletalk/ddp.c
net/atm/Makefile
net/ax25/af_ax25.c
net/econet/af_econet.c
net/packet/af_packet.c
net/sched/sch_ingress.c
net/x25/af_x25.c
net/x25/x25_link.c
scripts/Makefile
scripts/docgen [new file with mode: 0644]
scripts/docproc.c [new file with mode: 0644]
scripts/gen-all-syms [new file with mode: 0644]
scripts/kernel-doc [new file with mode: 0644]