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/01/10 20:02:45

Modified files:
        .              : Makefile README 
        Documentation  : Changes Configure.help IO-mapping.txt rtc.txt 
        Documentation/DocBook: mousedrivers.tmpl videobook.tmpl 
                               z8530book.tmpl 
        arch/alpha/kernel: setup.c smp.c 
        arch/i386      : vmlinux.lds 
        arch/i386/kernel: pci-irq.c process.c traps.c 
        arch/ia64      : Makefile config.in 
        arch/ia64/boot : Makefile 
        arch/ia64/dig  : Makefile setup.c 
        arch/ia64/hp   : Makefile hpsim_setup.c 
        arch/ia64/ia32 : Makefile binfmt_elf32.c ia32_entry.S 
                         ia32_ioctl.c ia32_traps.c sys_ia32.c 
        arch/ia64/kernel: Makefile acpi.c efi.c entry.S fw-emu.c head.S 
                          ia64_ksyms.c irq.c irq_ia64.c ivt.S machvec.c 
                          mca.c mca_asm.S minstate.h pal.S pci.c 
                          perfmon.c process.c ptrace.c sal.c setup.c 
                          signal.c smp.c sys_ia64.c time.c traps.c 
                          unaligned.c unwind.c 
        arch/ia64/lib  : Makefile copy_user.S flush.S io.c memcpy.S 
        arch/ia64/mm   : Makefile fault.c init.c tlb.c 
        arch/ia64/sn   : Makefile 
        arch/ia64/sn/sn1: Makefile irq.c setup.c 
        arch/ia64/tools: print_offsets.c 
        arch/m68k      : Makefile config.in 
        arch/m68k/amiga: amisound.c config.c 
        arch/m68k/atari: debug.c 
        arch/m68k/kernel: m68k_ksyms.c setup.c time.c traps.c 
        arch/m68k/lib  : Makefile 
        arch/m68k/mm   : fault.c 
        arch/mips      : config.in 
        arch/mips/lib  : rtc-no.c rtc-std.c 
        arch/mips/sgi/kernel: indy_rtc.c 
        arch/mips64/lib: rtc-no.c rtc-std.c 
        arch/sh        : config.in 
        arch/sh/kernel : Makefile setup.c sh_ksyms.c time.c 
        arch/sh/lib    : delay.c 
        arch/sh/mm     : fault.c 
        arch/sparc/kernel: entry.S semaphore.c setup.c smp.c 
        arch/sparc/mm  : fault.c 
        arch/sparc64/kernel: ioctl32.c setup.c smp.c 
        drivers/acpi/hardware: hwcpu32.c 
        drivers/acpi/namespace: nsxfobj.c 
        drivers/block  : ataflop.c cciss.c 
        drivers/char   : Makefile amiserial.c mem.c nvram.c pcxx.c 
                         riscom8.c rtc.c vt.c 
        drivers/char/drm: Makefile drm.h mga_drv.h r128_bufs.c 
                          r128_context.c r128_drm.h r128_drv.c 
                          r128_drv.h 
        drivers/char/joystick: iforce.c 
        drivers/ide    : cs5530.c hd.c hpt366.c ide-cd.c ide-cd.h 
                         ide-cs.c ide-dma.c ide-geometry.c ide-pci.c 
                         macide.c osb4.c piix.c sis5513.c 
        drivers/ieee1394: Makefile csr.c hosts.h ohci1394.c ohci1394.h 
                          video1394.c video1394.h 
        drivers/isdn   : Config.in isdn_common.c 
        drivers/isdn/hisax: md5sums.asc 
        drivers/md     : raid5.c 
        drivers/media/radio: radio-aimslab.c radio-aztech.c 
                             radio-rtrack2.c radio-sf16fmi.c 
                             radio-terratec.c radio-trust.c 
                             radio-typhoon.c radio-zoltrix.c 
        drivers/media/video: cpia_usb.c videodev.c 
        drivers/net    : 7990.c 7990.h 8390.c 8390.h Config.in Makefile 
                         Space.c acenic.c ariadne2.c hydra.c ioc3-eth.c 
                         mvme147.c ne.c rcpci45.c setup.c 
        drivers/net/hamradio: 6pack.c Makefile mkiss.c scc.c 
        drivers/net/irda: toshoboe.c 
        drivers/net/pcmcia: wavelan_cs.c 
        drivers/net/tulip: media.c tulip_core.c 
        drivers/parport: ChangeLog ieee1284.c parport_pc.c probe.c 
        drivers/pci    : pci.ids 
        drivers/sbus/char: zs.c 
        drivers/scsi   : README.ibmmca ibmmca.c mac_NCR5380.c mac_esp.c 
                         osst.c ppa.c ppa.h sg.c sun3x_esp.c sym53c8xx.c 
                         tmscsim.c 
        drivers/sound  : cs46xx.c i810_audio.c mpu401.c sb_ess.c 
                         sequencer.c sound_timer.c 
        drivers/usb    : acm.c audio.c bluetooth.c dabusb.c dc2xx.c 
                         dsbr100.c hid.c hub.c ibmcam.c mdc800.c 
                         microtek.c net1080.c ov511.c pegasus.c 
                         printer.c rio500.c scanner.c usb.c usbkbd.c 
                         usbmouse.c uss720.c wacom.c 
        drivers/usb/serial: belkin_sa.c digi_acceleport.c empeg.c 
                            ftdi_sio.c keyspan.h keyspan_pda.c omninet.c 
                            visor.c whiteheat.c 
        drivers/usb/storage: debug.h 
        drivers/video  : Config.in atyfb.c clgenfb.c fbmem.c retz3fb.c 
        fs             : buffer.c dcache.c exec.c 
        fs/isofs       : inode.c 
        fs/nfsd        : nfsfh.c 
        fs/smbfs       : smb_debug.h 
        fs/umsdos      : mangle.c 
        include/asm-alpha: delay.h smp.h 
        include/asm-i386: floppy.h semaphore.h 
        include/asm-ia64: a.out.h acpi-ext.h acpikcfg.h cache.h delay.h 
                          efi.h hw_irq.h ia32.h io.h iosapic.h machvec.h 
                          machvec_dig.h machvec_hpsim.h machvec_init.h 
                          machvec_sn1.h mca.h mman.h mmu_context.h 
                          module.h offsets.h page.h pci.h pgalloc.h 
                          pgtable.h processor.h ptrace.h sal.h 
                          shmparam.h spinlock.h system.h uaccess.h 
                          unistd.h 
        include/asm-m68k: delay.h floppy.h io.h movs.h param.h serial.h 
                          traps.h 
        include/asm-sh : bugs.h delay.h mmu_context.h param.h 
                         pgtable-2level.h pgtable.h processor.h ptrace.h 
                         siginfo.h timex.h uaccess.h 
        include/asm-sparc: atomic.h contregs.h delay.h processor.h 
                           semaphore.h 
        include/asm-sparc64: delay.h processor.h 
        include/linux  : dcache.h delay.h mc146818rtc.h netfilter_ipv6.h 
                         pci_ids.h rtc.h scc.h sched.h udf_fs.h usb.h 
                         zorro_ids.h 
        include/linux/netfilter_ipv4: ip_conntrack.h lockhelp.h 
        include/net    : sock.h 
        include/net/irda: irda.h 
        init           : main.c 
        kernel         : exit.c fork.c ksyms.c sched.c signal.c 
        mm             : filemap.c memory.c page_alloc.c vmscan.c 
        net/atm        : Makefile common.c lec.c 
        net/decnet     : af_decnet.c dn_table.c 
        net/ipv4       : arp.c tcp_ipv4.c tcp_timer.c udp.c 
        net/ipv4/netfilter: ipt_LOG.c 
        net/ipv6       : addrconf.c icmp.c tcp_ipv6.c udp.c 
        net/irda       : irias_object.c irqueue.c 
        net/packet     : af_packet.c 
        net/sched      : sch_api.c 
Added files:
        arch/ia64/kernel: iosapic.c 
        arch/ia64/lib  : swiotlb.c 
        arch/ia64/sn/fprom: Makefile README fpmem.c fpmem.h fprom.lds 
                            fpromasm.S fw-emu.c main.c runsim 
        arch/ia64/sn/io: Makefile alenlist.c cdl.c devsupport.c eeprom.c 
                         hcl.c hcl_util.c hubdev.c hubspc.c invent.c 
                         io.c ip37.c klconflib.c klgraph.c 
                         klgraph_hack.c l1.c l1_command.c labelcl.c 
                         mem_refcnt.c ml_SN_init.c ml_SN_intr.c 
                         ml_iograph.c module.c pci.c pci_bus_cvlink.c 
                         pci_dma.c pcibr.c pciio.c sgi_if.c 
                         sgi_io_init.c sgi_io_sim.c stubs.c xbow.c 
                         xswitch.c xtalk.c 
        arch/ia64/sn/sn1: discontig.c iomv.c llsc4.c llsc4.h mm.c smp.c 
                          sn1_asm.S synergy.c 
        arch/ia64/sn/tools: make_textsym 
        arch/m68k/lib  : ashldi3.c 
        arch/sh/kernel : rtc.c 
        drivers/char/drm: r128_cce.c r128_state.c 
        include/asm-ia64/sn: addrs.h agent.h alenlist.h arch.h cdl.h 
                             clksupport.h cmn_err.h dmamap.h driver.h 
                             eeprom.h gda.h hack.h hcl.h hcl_util.h 
                             hubspc.h hwcntrs.h intr.h intr_public.h 
                             invent.h io.h iobus.h ioc3.h ioerror.h 
                             ioerror_handling.h iograph.h klconfig.h 
                             kldir.h labelcl.h mem_refcnt.h mmzone.h 
                             mmzone_default.h mmzone_sn1.h module.h 
                             nic.h nodemask.h nodepda.h pio.h prio.h 
                             router.h sgi.h slotnum.h sn_cpuid.h 
                             sn_fru.h sn_private.h synergy.h 
                             systeminfo.h types.h vector.h war.h 
        include/asm-ia64/sn/arc: hinv.h types.h 
        include/asm-ia64/sn/ksys: elsc.h i2c.h l1.h 
        include/asm-ia64/sn/pci: bridge.h pci_bus_cvlink.h pci_defs.h 
                                 pcibr.h pcibr_private.h pciio.h 
                                 pciio_private.h 
        include/asm-ia64/sn/sn1: addrs.h arch.h bedrock.h hubdev.h 
                                 hubio.h hubio_next.h hublb.h 
                                 hublb_next.h hubmd.h hubmd_next.h 
                                 hubni.h hubni_next.h hubpi.h 
                                 hubpi_next.h hubxb.h hubxb_next.h 
                                 ip27config.h kldir.h leds.h promlog.h 
                                 router.h slotnum.h sn1.h uart16550.h 
                                 war.h 
        include/asm-ia64/sn/xtalk: xbow.h xbow_info.h xswitch.h xtalk.h 
                                   xtalk_private.h xtalkaddrs.h 
                                   xwidget.h 
        include/asm-sh : rtc.h 
Removed files:
        arch/ia64/dig  : iosapic.c 
        arch/ia64/kernel: pci-dma.c 
        arch/m68k/kernel: m68k_defs.h 
        drivers/char/drm: r128_dma.c 
        drivers/isdn/hisax: teles3c.c 
        drivers/net/hamradio: 6pack.h pi2.c pt.c 
        include/asm-sparc: semaphore-helper.h 
        net/atm        : lane_mpoa_init.c 

Log message:
        Merge with Linux 2.4.0.