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/07/28 15:58:44

Modified files:
        .              : Makefile 
        arch/alpha/lib : csum_partial_copy.c 
        arch/i386/kernel: setup.c 
        drivers/atm    : iphase.c 
        drivers/cdrom  : mcd.c 
        drivers/ide    : ide.c 
        drivers/net    : gmac.c gmac.h rcpci45.c 
        drivers/pcmcia : ds.c pci_socket.c yenta.c 
        drivers/scsi   : scsi_ioctl.c 
        drivers/sound  : msnd.c 
        drivers/usb    : usb.c 
        drivers/video  : S3triofb.c acornfb.c aty128fb.c chipsfb.c 
                         clgenfb.c controlfb.c cyber2000fb.c cyberfb.c 
                         dn_cfb4.c dn_cfb8.c dnfb.c fbgen.c fbmem.c 
                         fm2fb.c g364fb.c hgafb.c hitfb.c hpfb.c igafb.c 
                         macfb.c offb.c platinumfb.c q40fb.c retz3fb.c 
                         sa1100fb.c sbusfb.c sgivwfb.c sisfb.c 
                         skeletonfb.c sun3fb.c tgafb.c valkyriefb.c 
                         vesafb.c vfb.c vga16fb.c virgefb.c 
        fs             : dquot.c namei.c 
        fs/coda        : pioctl.c 
        fs/ext2        : inode.c 
        fs/fat         : cache.c 
        fs/jffs        : inode-v23.c 
        fs/minix       : inode.c 
        fs/smbfs       : ChangeLog proc.c 
        fs/sysv        : inode.c 
        fs/udf         : inode.c 
        fs/ufs         : inode.c 
        include/asm-i386: e820.h 
        include/asm-sh : sh_bios.h 
        include/linux  : fb.h i2c.h 
        init           : main.c 
        mm             : memory.c 

Log message:
        Merge with Linux 2.4.0-test5-pre6.