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        01/11/05 13:57:14

Modified files:
        .              : Makefile 
        Documentation/filesystems/devfs: ChangeLog README 
        arch/sparc/kernel: process.c systbls.S 
        arch/sparc64   : defconfig 
        arch/sparc64/kernel: dtlb_backend.S dtlb_base.S pci.c process.c 
                             systbls.S 
        drivers/net    : acenic.c acenic.h aironet4500.h at1700.c 
                         macsonic.c 
        drivers/net/sk98lin: skge.c 
        drivers/parport: ChangeLog ieee1284_ops.c parport_pc.c 
        drivers/sbus/audio: audio.c cs4231.c dbri.c dmy.c 
        drivers/sbus/char: aurora.c bpp.c cpwatchdog.c display7seg.c 
                           envctrl.c flash.c jsflash.c openprom.c 
                           riowatchdog.c rtc.c sab82532.c uctrl.c 
        drivers/scsi   : aic7xxx_old.c 
        drivers/usb    : uhci.c usbvideo.c usbvideo.h 
        drivers/usb/serial: belkin_sa.c cyberjack.c digi_acceleport.c 
                            empeg.c ftdi_sio.c io_edgeport.c ir-usb.c 
                            keyspan.c keyspan_pda.c mct_u232.c omninet.c 
                            pl2303.c usb-serial.h usbserial.c visor.c 
        drivers/video  : fbmem.c 
        fs             : namei.c namespace.c super.c 
        fs/devfs       : base.c 
        fs/ext2        : inode.c 
        fs/proc        : base.c 
        include/asm-i386: smp.h 
        include/asm-sparc: processor.h unistd.h 
        include/asm-sparc64: processor.h unistd.h 
        include/linux  : ext2_fs.h fs.h netdevice.h parport.h pci_ids.h 
                         sched.h shmem_fs.h 
        mm             : shmem.c 
        net/ipv4       : tcp.c 
Removed files:
        arch/ppc/8xx_io: commproc.h 
        drivers/mtd/chips: cfi_jedec.c 

Log message:
        Merge with Linux 2.4.12.