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 16:55:33

Modified files:
        .              : CREDITS MAINTAINERS Makefile 
        Documentation  : Configure.help DMA-mapping.txt README.DAC960 
                         README.nsp_cs.eng cachetlb.txt cciss.txt 
                         sonypi.txt 
        Documentation/arm: README 
        Documentation/arm/SA1100: Pangolin 
        Documentation/filesystems: udf.txt 
        Documentation/filesystems/devfs: ToDo 
        Documentation/i2c: dev-interface summary writing-clients 
        Documentation/networking: 8139too.txt 
        Documentation/s390: CommonIO chandev.8 s390dbf.txt 
        Documentation/usb: error-codes.txt philips.txt scanner.txt 
        Documentation/video4linux: meye.txt 
        Documentation/video4linux/bttv: CARDLIST Insmod-options 
                                        Sound-FAQ 
        arch/alpha/kernel: alpha_ksyms.c core_cia.c core_mcpcia.c 
                           core_titan.c core_tsunami.c pci.c pci_impl.h 
                           pci_iommu.c srm_env.c sys_cabriolet.c 
                           sys_dp264.c sys_eiger.c sys_miata.c 
                           sys_rawhide.c sys_ruffian.c sys_sx164.c 
                           sys_titan.c 
        arch/arm       : Makefile config.in 
        arch/arm/boot  : Makefile 
        arch/arm/boot/bootp: Makefile init.S 
        arch/arm/boot/compressed: Makefile head-sa1100.S 
        arch/arm/kernel: Makefile armksyms.c bios32.c compat.c dma-isa.c 
                         entry-armv.S entry-common.S entry-header.S 
                         head-armv.S init_task.c setup.c signal.c time.c 
                         traps.c 
        arch/arm/lib   : Makefile 
        arch/arm/mach-ebsa110: io.c 
        arch/arm/mach-integrator: cpu.c dma.c pci_v3.c 
        arch/arm/mach-sa1100: Makefile assabet.c cpu-sa1110.c 
                              dma-sa1100.c dma-sa1111.c generic.c 
                              graphicsclient.c jornada720.c leds.c 
                              leds.h neponset.c pangolin.c pfs168.c 
                              sa1111-pcibuf.c sa1111.c sa1111.h xp860.c 
        arch/arm/mm    : extable.c fault-armv.c fault-common.c init.c 
                         proc-arm720.S 
        arch/arm/tools : Makefile getconstants.c mach-types 
        arch/cris      : config.in 
        arch/i386      : config.in defconfig 
        arch/i386/kernel: apm.c bluesmoke.c cpuid.c dmi_scan.c entry.S 
                          i386_ksyms.c ldt.c microcode.c msr.c mtrr.c 
                          pci-irq.c setup.c smp.c 
        arch/ia64      : config.in 
        arch/ia64/sn/io: pci_dma.c 
        arch/mips      : config.in defconfig defconfig-atlas 
                         defconfig-ddb5476 defconfig-ddb5477 
                         defconfig-decstation defconfig-ev64120 
                         defconfig-ev96100 defconfig-ip22 
                         defconfig-it8172 defconfig-malta defconfig-nino 
                         defconfig-ocelot defconfig-osprey 
                         defconfig-pb1000 defconfig-rm200 
        arch/mips/kernel: syscalls.h 
        arch/mips64    : config.in defconfig defconfig-ip22 
                         defconfig-ip27 defconfig-ip32 
        arch/mips64/kernel: linux32.c scall_64.S scall_o32.S 
        arch/parisc/kernel: ccio-dma.c ccio-rm-dma.c pci-dma.c 
                            sba_iommu.c 
        arch/ppc       : Makefile 
        arch/ppc/8xx_io: Config.in enet.c fec.c 
        arch/ppc/amiga : config.c 
        arch/ppc/boot/prep: misc.c 
        arch/ppc/kernel: m8xx_setup.c prep_pci.c prep_setup.c 
        arch/s390      : Makefile 
        arch/s390/kernel: Makefile debug.c entry.S gdb-stub.c head.S 
                          process.c s390_ksyms.c setup.c signal.c smp.c 
                          time.c traps.c 
        arch/s390/math-emu: math.c 
        arch/s390/mm   : extable.c fault.c init.c 
        arch/s390x     : Makefile config.in defconfig 
        arch/s390x/kernel: Makefile cpcmd.c debug.c entry.S head.S 
                           ioctl32.c linux32.c linux32.h process.c 
                           s390_ksyms.c setup.c signal.c signal32.c 
                           smp.c time.c traps.c wrapper32.S 
        arch/s390x/mm  : extable.c fault.c init.c 
        arch/sh        : Makefile config.in defconfig 
        arch/sh/kernel : io_generic.c io_hd64461.c io_se.c process.c 
                         ptrace.c signal.c sys_sh.c 
        arch/sh/lib    : memchr.S memcpy.S memmove.S memset.S 
        arch/sh/mm     : cache-sh3.c cache-sh4.c fault.c init.c 
        arch/sparc/kernel: systbls.S 
        arch/sparc64   : Makefile defconfig 
        arch/sparc64/kernel: dtlb_base.S entry.S ioctl32.c 
                             iommu_common.c iommu_common.h pci_iommu.c 
                             pci_psycho.c pci_sabre.c pci_schizo.c 
                             process.c rtrap.S sbus.c setup.c smp.c 
                             sparc64_ksyms.c sys_sparc32.c systbls.S 
        arch/sparc64/mm: init.c ultra.S 
        arch/sparc64/prom: p1275.c 
        drivers        : Makefile 
        drivers/acorn/block: mfmhd.c 
        drivers/acorn/char: mouse_rpc.c 
        drivers/acorn/scsi: acornscsi.c arxescsi.c cumana_2.c ecoscsi.c 
                            eesox.c fas216.c msgqueue.c oak.c powertec.c 
                            queue.c 
        drivers/acpi/include/platform: acgcc.h 
        drivers/acpi/ospm/thermal: tz_osl.c 
        drivers/block  : DAC960.c DAC960.h acsi.c amiflop.c ataflop.c 
                         blkpg.c cciss.c cpqarray.c floppy.c genhd.c 
                         ll_rw_blk.c loop.c nbd.c ps2esdi.c rd.c xd.c 
        drivers/block/paride: aten.c bpck.c comm.c dstr.c epat.c epia.c 
                              fit2.c fit3.c friq.c frpw.c kbic.c ktti.c 
                              on20.c on26.c paride.c pcd.c pd.c pf.c 
                              pg.c ppc6lnx.c pt.c 
        drivers/cdrom  : cdrom.c 
        drivers/char   : Config.in Makefile adbmouse.c console.c epca.c 
                         i810_rng.c ip2main.c istallion.c nwflash.c 
                         random.c sh-sci.c sonypi.c sonypi.h toshiba.c 
        drivers/char/drm: drm_drv.h drm_proc.h drm_vm.h ffb_drv.c 
        drivers/char/joystick: analog.c 
        drivers/char/mwave: mwavedd.c 
        drivers/fc4    : soc.c socal.c 
        drivers/i2c    : Config.in Makefile i2c-adap-ite.c 
                         i2c-algo-bit.c i2c-algo-ite.c i2c-algo-pcf.c 
                         i2c-core.c i2c-dev.c i2c-elektor.c i2c-elv.c 
                         i2c-velleman.c 
        drivers/ide    : hd.c hptraid.c hptraid.h ide-cd.c ide-disk.c 
                         ide-floppy.c ide-probe.c ide.c pdcraid.c 
                         rapide.c 
        drivers/ieee1394: Makefile ieee1394.h ieee1394_core.c 
                          ieee1394_types.h nodemgr.c sbp2.c sbp2.h 
        drivers/input  : keybdev.c 
        drivers/macintosh: macserial.c nvram.c rtc.c 
        drivers/md     : lvm.c md.c raid1.c raid5.c 
        drivers/media/video: bttv-cards.c bttv-driver.c bttv-if.c bttv.h 
                             bttvp.h bw-qcam.c id.h msp3400.c planb.c 
                             saa7110.c tda7432.c tda9875.c tuner.c 
                             tuner.h tvaudio.c tvaudio.h tvmixer.c 
                             videodev.c 
        drivers/message/fusion: isense.c 
        drivers/mtd    : Config.in ftl.c mtdblock.c mtdblock_ro.c 
                         nftlcore.c 
        drivers/net    : 8139too.c Config.in Makefile a2065.c acenic.c 
                         acenic.h atari_bionet.c atari_pamsnet.c 
                         atarilance.c bagetlance.c bmac.c fealnx.c 
                         fmv18x.c gmac.c gt96100eth.c hplance.c hydra.c 
                         ibmlana.c ioc3-eth.c isa-skeleton.c 
                         lasi_82596.c mac89x0.c mace.c macsonic.c 
                         mvme147.c myri_sbus.c ne2.c oaknet.c 
                         pci-skeleton.c pcnet32.c ppp_generic.c 
                         ppp_synctty.c saa9730.c seeq8005.c sgiseeq.c 
                         sk_g16.c sk_mca.c smc-mca.c smc9194.c sonic.c 
                         stnic.c sun3lance.c sunbmac.c sundance.c 
                         sungem.c sungem.h sunhme.c sunlance.c sunqe.c 
                         via-rhine.c wavelan.c wavelan.p.h yellowfin.c 
        drivers/net/hamradio: scc.c 
        drivers/net/pcmcia: netwave_cs.c ray_cs.c wavelan_cs.c 
                            wavelan_cs.h xircom_tulip_cb.c 
        drivers/net/sk98lin: skge.c 
        drivers/net/tulip: interrupt.c tulip_core.c 
        drivers/net/wireless: airo.c airport.c 
        drivers/nubus  : nubus_syms.c 
        drivers/parport: ieee1284_ops.c parport_amiga.c parport_atari.c 
                         parport_pc.c 
        drivers/pci    : gen-devlist.c pci.c pci.ids 
        drivers/pcmcia : Makefile cs.c 
        drivers/pnp    : isapnp.c 
        drivers/s390/block: dasd.c dasd_3990_erp.c xpram.c 
        drivers/s390/char: Makefile hwc_cpi.c tape34xx.c tapechar.c 
                           tuball.c tubtty.c 
        drivers/s390/net: ctcmain.c iucv.c netiucv.c 
        drivers/sbus/audio: amd7930.c 
        drivers/sbus/char: aurora.c bpp.c jsflash.c sab82532.c su.c zs.c 
        drivers/scsi   : 53c700.c 53c700.h Config.in README.53c700 
                         aha152x.c aha1542.c aic7xxx_old.c dpt_i2o.c 
                         i60uscsi.h i91uscsi.h ini9100u.h inia100.h 
                         osst.c qlogicfc.c qlogicfc.h scsi.c scsi.h 
                         scsi_debug.c scsi_lib.c scsi_merge.c 
                         scsi_scan.c sd.c sr.c sr_ioctl.c st.c 
                         sym53c8xx.c sym53c8xx_comm.h sym53c8xx_defs.h 
        drivers/scsi/pcmcia: nsp_cs.c nsp_cs.h nsp_debug.c nsp_io.h 
                             nsp_message.c 
        drivers/sgi/char: graphics.c 
        drivers/sound  : btaudio.c cmpci.c ite8172.c maestro3.c 
                         nec_vrc5477.c opl3sa2.c sb_card.c trident.c 
                         vidc.c ymfpci.c 
        drivers/tc     : tc.c 
        drivers/usb    : Config.in devices.c hiddev.c inode.c kaweth.c 
                         pegasus.h pwc-ctrl.c pwc-if.c pwc-ioctl.h pwc.h 
                         scanner.c scanner.h uhci.c uhci.h ultracam.c 
                         usb-ohci.c usb-uhci.c usb.c usbnet.c uss720.c 
        drivers/usb/serial: Config.in ftdi_sio.c 
        drivers/video  : Config.in acornfb.c amifb.c aty128fb.c 
                         cgsixfb.c controlfb.c creatorfb.c cyber2000fb.c 
                         cyber2000fb.h cyberfb.c dn_cfb8.c fbcon-afb.c 
                         fbcon-cfb16.c fbcon-cfb2.c fbcon-cfb24.c 
                         fbcon-cfb32.c fbcon-cfb4.c fbcon-cfb8.c 
                         fbcon-hga.c fbcon-ilbm.c fbcon-iplan2p2.c 
                         fbcon-iplan2p4.c fbcon-iplan2p8.c fbcon-mfb.c 
                         fbcon-sti.c fbcon-vga-planes.c fbcon.c fm2fb.c 
                         hgafb.c igafb.c imsttfb.c leofb.c macfb.c 
                         newport_con.c platinumfb.c promcon.c pvr2fb.c 
                         radeonfb.c retz3fb.c sa1100fb.c sgivwfb.c 
                         sstfb.c sticon-bmode.c sticon.c tdfxfb.c 
                         tgafb.c valkyriefb.c vesafb.c vfb.c vga16fb.c 
                         vgacon.c virgefb.c 
        drivers/video/aty: atyfb_base.c 
        drivers/video/matrox: matroxfb_accel.c matroxfb_base.c 
        drivers/video/riva: accel.c fbdev.c 
        drivers/video/sis: sis_main.c 
        fs             : attr.c binfmt_elf.c binfmt_misc.c block_dev.c 
                         buffer.c locks.c namei.c namespace.c open.c 
                         super.c 
        fs/devfs       : util.c 
        fs/ext2        : Makefile file.c inode.c 
        fs/fat         : cache.c dir.c fatfs_syms.c inode.c misc.c 
        fs/freevxfs    : vxfs_super.c 
        fs/hfs         : catalog.c 
        fs/isofs       : inode.c 
        fs/lockd       : clntproc.c svc.c svclock.c svcproc.c 
        fs/msdos       : namei.c 
        fs/nfs         : read.c write.c 
        fs/nfsd        : nfsctl.c nfsproc.c nfssvc.c nfsxdr.c 
        fs/ntfs        : fs.c 
        fs/partitions  : check.c msdos.c 
        fs/proc        : array.c proc_misc.c root.c 
        fs/reiserfs    : Makefile README bitmap.c dir.c do_balan.c 
                         file.c fix_node.c hashes.c ibalance.c inode.c 
                         item_ops.c journal.c lbalance.c namei.c 
                         objectid.c prints.c stree.c super.c 
                         tail_conversion.c 
        fs/udf         : balloc.c dir.c file.c ialloc.c inode.c 
                         lowlevel.c namei.c super.c truncate.c udfdecl.h 
        fs/ufs         : dir.c ialloc.c inode.c namei.c 
        fs/vfat        : namei.c vfatfs_syms.c 
        include/asm-alpha: bitops.h core_cia.h core_mcpcia.h 
                           core_titan.h core_tsunami.h machvec.h pci.h 
                           scatterlist.h types.h vga.h 
        include/asm-arm: a.out.h atomic.h cpu-multi32.h cpu-single.h 
                         hardirq.h io.h pci.h pgtable.h processor.h 
                         scatterlist.h setup.h signal.h uaccess.h 
        include/asm-arm/arch-sa1100: SA-1111.h assabet.h dma.h 
                                     hardware.h irqs.h keyboard.h 
                                     pangolin.h uncompress.h 
        include/asm-arm/hardware: pci_v3.h 
        include/asm-arm/mach: arch.h 
        include/asm-i386: page.h pci.h scatterlist.h smp.h system.h 
                          types.h unistd.h 
        include/asm-ia64: pci.h scatterlist.h 
        include/asm-m68k: scatterlist.h 
        include/asm-mips: pci.h scatterlist.h unistd.h 
        include/asm-mips64: pci.h scatterlist.h unistd.h 
        include/asm-parisc: pci.h scatterlist.h 
        include/asm-ppc: pci.h ppcboot.h scatterlist.h types.h 
        include/asm-s390: chandev.h current.h dasd.h debug.h gdb-stub.h 
                          lowcore.h pgalloc.h pgtable.h ptrace.h 
                          scatterlist.h sigp.h smp.h softirq.h 
                          spinlock.h uaccess.h ucontext.h unistd.h 
                          vtoc.h 
        include/asm-s390x: chandev.h current.h dasd.h debug.h lowcore.h 
                           page.h param.h pgtable.h scatterlist.h sigp.h 
                           smp.h softirq.h spinlock.h ucontext.h 
                           unistd.h 
        include/asm-sh : ioctl.h namei.h pci.h scatterlist.h uaccess.h 
        include/asm-sparc: highmem.h pci.h pgalloc.h scatterlist.h 
                           unistd.h 
        include/asm-sparc64: cache.h hardirq.h pci.h pgalloc.h pgtable.h 
                             scatterlist.h types.h unistd.h 
        include/linux  : b1lli.h b1pcmcia.h blkdev.h console_struct.h 
                         ethtool.h ext2_fs.h fs.h genhd.h i2c-dev.h 
                         i2c-elektor.h i2c-id.h i2c.h i2o-dev.h i2o.h 
                         locks.h mm.h msdos_fs.h msdos_fs_sb.h pci.h 
                         pci_ids.h reiserfs_fs.h reiserfs_fs_i.h 
                         reiserfs_fs_sb.h slab.h sonypi.h spinlock.h 
                         swap.h udf_fs.h udf_fs_sb.h ufs_fs.h usb.h 
                         videodev.h vt_buffer.h wireless.h 
        include/net    : route.h 
        include/pcmcia : cs_types.h ss.h 
        init           : main.c 
        ipc            : shm.c 
        kernel         : context.c exit.c ksyms.c sched.c 
        lib            : vsprintf.c 
        mm             : filemap.c highmem.c memory.c page_alloc.c 
                         shmem.c swap.c swapfile.c vmscan.c 
        net            : socket.c 
        net/ax25       : ax25_ip.c 
        net/bridge     : br.c 
        net/core       : dev.c 
        net/ipv4       : ip_output.c ipconfig.c ipip.c route.c 
                         syncookies.c tcp_ipv4.c udp.c 
        net/ipv6       : af_inet6.c tcp_ipv6.c 
        net/ipv6/netfilter: ip6t_mac.c 
        net/sunrpc     : sched.c stats.c 
Added files:
        Documentation/arm/SA1100: ADSBitsy GraphicsMaster 
        Documentation/video4linux/bttv: Cards README.quirks Tuners 
        arch/arm/lib   : ashldi3.c ashrdi3.c gcclib.h getuser.S kbd.c 
                         lib1funcs.S longlong.h lshrdi3.c muldi3.c 
                         putuser.S ucmpdi2.c udivdi3.c 
        arch/arm/mach-sa1100: adsbitsy.c graphicsmaster.c h3600.c 
                              leds-graphicsmaster.c 
        arch/arm/mm    : mm-ftvpci.c 
        drivers/char   : ib700wdt.c shwdt.c 
        drivers/i2c    : i2c-proc.c 
        drivers/message/i2o: Config.in Makefile README README.ioctl 
                             i2o_block.c i2o_config.c i2o_core.c 
                             i2o_lan.c i2o_lan.h i2o_pci.c i2o_proc.c 
                             i2o_scsi.c i2o_scsi.h 
        drivers/net    : 8139cp.c 
        drivers/pcmcia : sa1100.h sa1100_adsbitsy.c sa1100_assabet.c 
                         sa1100_cerf.c sa1100_flexanet.c 
                         sa1100_freebird.c sa1100_generic.c 
                         sa1100_graphicsclient.c sa1100_graphicsmaster.c 
                         sa1100_h3600.c sa1100_jornada720.c 
                         sa1100_neponset.c sa1100_pangolin.c 
                         sa1100_pfs168.c sa1100_simpad.c sa1100_stork.c 
                         sa1100_xp860.c sa1100_yopy.c 
        include/asm-arm/arch-sa1100: adsbitsy.h graphicsmaster.h h3600.h 
        include/asm-mips: .pci.h.swp 
        include/linux  : i2c-proc.h 
Removed files:
        Documentation/video4linux: README.buz 
        arch/arm/boot/compressed: setup-sa1100.S 
        arch/arm/mach-sa1100: bitsy.c 
        arch/arm/mm    : mm-nexuspci.c 
        arch/s390/kernel: lowcore.S 
        arch/s390x/kernel: lowcore.S mathemu.c 
        drivers/i2o    : Config.in Makefile README README.ioctl 
                         i2o_block.c i2o_config.c i2o_core.c i2o_lan.c 
                         i2o_lan.h i2o_pci.c i2o_proc.c i2o_scsi.c 
                         i2o_scsi.h 
        fs/ext2        : acl.c 
        fs/fat         : msbuffer.h tables.c tables.h 
        include/asm-arm/arch-sa1100: bitsy.h 
        include/asm-s390x: mathemu.h 

Log message:
        Merge with Linux 2.1.13.