CVS Update@oss.sgi.com: linux

[Ralf Baechle <ralf@oss.sgi.com>]

CVSROOT:        /home/pub/cvs
Module name:    linux
Changes by:     ralf@oss.sgi.com        00/06/20 18:44:40

Modified files:
        .              : Makefile 
        Documentation/DocBook: kernel-api.tmpl 
        Documentation/usb: ov511.txt 
        arch/alpha/kernel: console.c core_titan.c sys_titan.c 
                           sys_wildfire.c 
        arch/ppc/8xx_io: fec.c 
        arch/ppc/mbxboot: embed_config.c 
        arch/sh/kernel : time.c 
        arch/sparc     : defconfig 
        arch/sparc/kernel: entry.S ptrace.c signal.c sys_sparc.c 
                           sys_sunos.c time.c 
        arch/sparc/lib : memset.S 
        arch/sparc/mm  : srmmu.c 
        arch/sparc64   : config.in defconfig 
        arch/sparc64/kernel: entry.S ptrace.c signal.c signal32.c 
                             sys_sparc.c sys_sparc32.c sys_sunos32.c 
        drivers/char   : scan_keyb.c 
        drivers/isdn/avmb1: capi.c 
        drivers/net    : ptifddi.c sunbmac.c sunlance.c sunqe.c 
        drivers/sbus/audio: audio.c 
        drivers/sbus/char: envctrl.c flash.c pcikbd.c rtc.c uctrl.c 
        drivers/sound  : es1370.c es1371.c i810_audio.c 
        drivers/usb    : hub.c hub.h ov511.c printer.c 
        drivers/video  : S3triofb.c acornfb.c aty128fb.c chipsfb.c 
                         clgenfb.c controlfb.c dn_cfb4.c dn_cfb8.c 
                         dnfb.c fbmem.c fm2fb.c g364fb.c hgafb.c hitfb.c 
                         hpfb.c igafb.c imsttfb.c macfb.c offb.c 
                         platinumfb.c pm2fb.c q40fb.c retz3fb.c 
                         sa1100fb.c sbusfb.c sgivwfb.c sisfb.c 
                         skeletonfb.c sun3fb.c tdfxfb.c tgafb.c 
                         valkyriefb.c vesafb.c vfb.c vga16fb.c virgefb.c 
        drivers/video/matrox: matroxfb_base.c matroxfb_crtc2.c 
        drivers/video/riva: fbdev.c 
        fs             : buffer.c 
        fs/nfs         : proc.c 
        include/asm-arm/arch-sa1100: hardware.h 
        include/asm-sh : hd64461.h keyboard.h 
        include/asm-sparc: asm_offsets.h 
        include/asm-sparc64: asm_offsets.h string.h 
        include/linux  : socket.h 
        include/linux/netfilter_ipv4: ip_conntrack.h 
        mm             : filemap.c slab.c swap_state.c vmscan.c 
        net/bridge     : br_stp.c 
        net/ipv4       : ipconfig.c 
        net/ipv4/netfilter: ip_conntrack_core.c 
        net/unix       : af_unix.c 
        scripts        : Configure 

Log message:
        Merge with Linux 2.4.0-ac22-riel.