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 23:56:17

Modified files:
        .              : CREDITS MAINTAINERS Makefile 
        Documentation  : Configure.help computone.txt pci.txt 
        Documentation/DocBook: Makefile parportbook.tmpl 
        Documentation/arm/SA1100: Assabet 
        Documentation/filesystems: vfat.txt 
        Documentation/filesystems/devfs: ChangeLog 
        Documentation/networking: 8139too.txt 
        arch/alpha     : config.in 
        arch/alpha/kernel: alpha_ksyms.c osf_sys.c pci.c pci_iommu.c 
                           setup.c time.c traps.c 
        arch/alpha/lib : Makefile 
        arch/arm       : config.in 
        arch/arm/def-configs: assabet graphicsclient h3600 lart neponset 
                              pangolin shark 
        arch/arm/kernel: Makefile debug-armv.S entry-armv.S 
        arch/arm/lib   : backtrace.S io-acorn.S 
        arch/arm/mach-sa1100: Makefile assabet.c cerf.c dma-sa1100.c 
                              dma-sa1111.c freebird.c graphicsclient.c 
                              graphicsmaster.c h3600.c leds-assabet.c 
                              leds-cerf.c leds-simpad.c leds.c leds.h 
                              neponset.c simpad.c 
        arch/arm/mach-shark: dma.c leds.c mm.c 
        arch/arm/mm    : fault-armv.c proc-arm920.S proc-sa110.S 
        arch/arm/tools : mach-types 
        arch/i386      : config.in defconfig 
        arch/i386/kernel: apic.c entry.S io_apic.c irq.c microcode.c 
                          mtrr.c pci-i386.c pci-irq.c pci-pc.c 
                          pci-visws.c setup.c 
        arch/mips      : 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/mips64    : defconfig defconfig-ip22 defconfig-ip27 
                         defconfig-ip32 
        arch/ppc       : config.in defconfig 
        arch/ppc/8260_io: commproc.c 
        arch/ppc/8xx_io: commproc.c uart.c 
        arch/ppc/configs: IVMS8_defconfig SM850_defconfig 
                          SPD823TS_defconfig TQM823L_defconfig 
                          TQM850L_defconfig TQM860L_defconfig 
                          apus_defconfig bseip_defconfig 
                          common_defconfig est8260_defconfig 
                          gemini_defconfig ibmchrp_defconfig 
                          mbx_defconfig oak_defconfig power3_defconfig 
                          rpxcllf_defconfig rpxlite_defconfig 
                          walnut_defconfig 
        arch/ppc/kernel: Makefile apus_setup.c gemini_pci.c 
                         gemini_setup.c head.S head_8xx.S idle.c 
                         m8260_setup.c m8xx_setup.c misc.S oak_setup.c 
                         open_pic.c open_pic.h pci.c pmac_setup.c 
                         ppc_asm.h ppc_htab.c ppc_ksyms.c prep_setup.c 
                         setup.c smp.c syscalls.c traps.c walnut_setup.c 
        arch/ppc/lib   : string.S 
        arch/ppc/mm    : 4xx_mmu.c cachemap.c mmu_decl.h 
        arch/sh/kernel : pci-sh7751.c 
        arch/sparc     : defconfig 
        arch/sparc/kernel: check_asm.sh ioport.c sparc-stub.c time.c 
                           windows.c 
        arch/sparc/mm  : fault.c srmmu.c sun4c.c 
        arch/sparc/prom: console.c 
        arch/sparc64   : defconfig 
        arch/sparc64/kernel: ioctl32.c setup.c smp.c sparc64_ksyms.c 
                             sys_sparc.c 
        arch/sparc64/mm: init.c ultra.S 
        drivers/acorn/block: mfmhd.c 
        drivers/acorn/char: keyb_ps2.c 
        drivers/acorn/scsi: cumana_2.c ecoscsi.c eesox.c powertec.c 
        drivers/acpi   : Makefile acpi_ksyms.c driver.c os.c 
        drivers/acpi/debugger: dbcmds.c dbdisasm.c dbdisply.c dbfileio.c 
                               dbinput.c dbstats.c dbutils.c dbxface.c 
        drivers/acpi/dispatcher: dsfield.c dsmethod.c dsobject.c 
                                 dsopcode.c dsutils.c dswexec.c 
                                 dswload.c dswscope.c dswstate.c 
        drivers/acpi/events: evevent.c evmisc.c evregion.c evrgnini.c 
                             evxface.c evxfevnt.c evxfregn.c 
        drivers/acpi/executer: exconfig.c exconvrt.c excreate.c exdump.c 
                               exfldio.c exmisc.c exprep.c exregion.c 
                               exresnte.c exresolv.c exresop.c exstore.c 
                               exutils.c 
        drivers/acpi/hardware: hwacpi.c hwgpe.c hwregs.c hwsleep.c 
                               hwtimer.c 
        drivers/acpi/include: acconfig.h acdebug.h acdispat.h acevents.h 
                              acglobal.h achware.h acinterp.h aclocal.h 
                              acmacros.h acnamesp.h acobject.h 
                              acparser.h acpixf.h acstruct.h actables.h 
                              actbl.h actbl1.h actbl2.h actbl71.h 
                              actypes.h acutils.h amlcode.h 
        drivers/acpi/include/platform: acenv.h acgcc.h aclinux.h 
        drivers/acpi/namespace: nsaccess.c nsalloc.c nsdump.c nseval.c 
                                nsinit.c nsload.c nsnames.c nsobject.c 
                                nssearch.c nsutils.c nswalk.c nsxfname.c 
                                nsxfobj.c 
        drivers/acpi/ospm/ac_adapter: ac.c ac_osl.c 
        drivers/acpi/ospm/battery: bt.c bt_osl.c 
        drivers/acpi/ospm/busmgr: bm.c bm_osl.c bmpower.c bmutils.c 
        drivers/acpi/ospm/button: bn.c bn_osl.c 
        drivers/acpi/ospm/ec: ec_osl.c ecmain.c ecspace.c 
        drivers/acpi/ospm/include: bn.h bt.h pr.h tz.h 
        drivers/acpi/ospm/processor: pr.c pr_osl.c prperf.c prpower.c 
        drivers/acpi/ospm/system: sm.c sm_osl.c 
        drivers/acpi/ospm/thermal: tz.c tz_osl.c tzpolicy.c 
        drivers/acpi/parser: psargs.c psopcode.c psparse.c psscope.c 
                             pstree.c psutils.c pswalk.c psxface.c 
        drivers/acpi/resources: rsutils.c rsxface.c 
        drivers/acpi/tables: tbconvrt.c tbget.c tbinstal.c tbutils.c 
                             tbxface.c tbxfroot.c 
        drivers/acpi/utilities: utalloc.c utcopy.c utdebug.c utdelete.c 
                                uteval.c utglobal.c utinit.c utmisc.c 
                                utobject.c utxface.c 
        drivers/atm    : Config.in Makefile atmdev_init.c nicstar.h 
        drivers/block  : DAC960.c acsi.c amiflop.c ataflop.c cciss.c 
                         cciss_cmd.h cpqarray.c floppy.c ida_cmd.h 
                         ll_rw_blk.c loop.c nbd.c ps2esdi.c rd.c xd.c 
                         z2ram.c 
        drivers/block/paride: Config.in epat.c pcd.c pd.c pf.c 
        drivers/cdrom  : aztcd.c cdrom.c cdu31a.c cm206.c gscd.c mcd.c 
                         mcdx.c optcd.c sbpcd.c sjcd.c sonycd535.c 
        drivers/char   : Config.in Makefile README.computone applicom.c 
                         ip2.c ip2main.c istallion.c lp.c misc.c moxa.c 
                         mxser.c random.c serial.c tty_io.c vt.c 
        drivers/char/drm: drmP.h drm_vm.h 
        drivers/char/ip2: i2cmd.c i2ellis.c i2ellis.h i2lib.c i2lib.h 
                          ip2.h 
        drivers/char/joystick: analog.c 
        drivers/char/rio: rio_linux.c 
        drivers/ide    : ataraid.c buddha.c falconide.c icside.c 
                         ide-cd.c ide-pci.c ide.c pdc202xx.c piix.c 
                         q40ide.c 
        drivers/isdn   : isdn_ppp.c 
        drivers/isdn/hisax: md5sums.asc niccy.c st5481_d.c st5481_usb.c 
        drivers/md     : lvm.c md.c 
        drivers/media/video: cpia.c cpia.h cpia_pp.c cpia_usb.c meye.c 
                             planb.c 
        drivers/message/i2o: i2o_block.c i2o_pci.c i2o_proc.c 
        drivers/mtd    : ftl.c mtdblock.c mtdblock_ro.c nftlcore.c 
        drivers/mtd/chips: cfi_cmdset_0002.c 
        drivers/net    : 8139cp.c acenic.c natsemi.c sgiseeq.c sunbmac.c 
                         sunlance.c 
        drivers/net/arcnet: arc-rimi.c arcnet.c com20020-isa.c 
                            com20020-pci.c com20020.c com90io.c 
                            com90xx.c 
        drivers/net/hamradio: scc.c 
        drivers/net/irda: Config.in Makefile 
        drivers/net/pcmcia: xircom_tulip_cb.c 
        drivers/net/wireless: hermes.h 
        drivers/parport: ChangeLog ieee1284.c ieee1284_ops.c 
                         parport_pc.c 
        drivers/pci    : compat.c gen-devlist.c pci.c pci.ids proc.c 
                         quirks.c 
        drivers/pcmcia : Config.in Makefile ds.c sa1100_assabet.c 
                         sa1100_cerf.c sa1100_generic.c 
                         sa1100_neponset.c sa1100_simpad.c 
                         sa1100_stork.c 
        drivers/pnp    : Config.in quirks.c 
        drivers/s390/block: dasd.c xpram.c 
        drivers/s390/char: tapeblock.c 
        drivers/sbus/char: aurora.c jsflash.c zs.c 
        drivers/scsi   : 53c7,8xx.c 53c7xx.c 53c7xx.h a2091.c a3000.c 
                         amiga7xx.c blz1230.c blz2060.c bvme6000.c 
                         constants.c cpqfc.Readme cpqfcTScontrol.c 
                         cpqfcTSinit.c cpqfcTSioctl.h cpqfcTSstructs.h 
                         cpqfcTSworker.c cyberstorm.c cyberstormII.c 
                         dtc.h fastlane.c gdth.c gvp11.c jazz_esp.c 
                         mac_esp.c mca_53c9x.c megaraid.c megaraid.h 
                         mvme147.c mvme16x.c oktagon_esp.c osst.c 
                         qlogicfas.c qlogicfc.c qlogicisp.c qlogicpti.c 
                         scsi_merge.c sd.c sg.c sgiwd93.c sr.c st.c 
                         sun3_NCR5380.c sun3_scsi.c sun3x_esp.c 
                         u14-34f.c wd33c93.c wd33c93.h 
        drivers/scsi/aic7xxx: aic7770.c aic7770_linux.c aic7xxx.c 
                              aic7xxx.h aic7xxx.reg aic7xxx.seq 
                              aic7xxx_93cx6.c aic7xxx_93cx6.h 
                              aic7xxx_inline.h aic7xxx_linux.c 
                              aic7xxx_linux_host.h aic7xxx_linux_pci.c 
                              aic7xxx_osm.h aic7xxx_pci.c aic7xxx_proc.c 
                              aic7xxx_reg.h aic7xxx_seq.h cam.h 
        drivers/scsi/aic7xxx/aicasm: Makefile aicasm.c aicasm.h 
                                     aicasm_gram.y aicasm_insformat.h 
                                     aicasm_scan.l aicasm_symbol.c 
                                     aicasm_symbol.h 
        drivers/sound  : i810_audio.c ite8172.c nec_vrc5477.c rme96xx.c 
                         sb_ess.c trident.c waveartist.c waveartist.h 
        drivers/sound/dmasound: dmasound_atari.c dmasound_awacs.c 
                                dmasound_core.c dmasound_paula.c 
                                dmasound_q40.c 
        drivers/sound/emu10k1: hwaccess.h 
        drivers/telephony: ixj.c 
        drivers/usb    : Config.in devio.c usb-ohci.h usb-uhci-debug.h 
                         usbnet.c 
        drivers/usb/serial: ir-usb.c 
        drivers/usb/storage: sddr09.c 
        drivers/video  : Makefile clgenfb.c cyber2000fb.c radeon.h 
                         radeonfb.c sa1100fb.c sa1100fb.h 
        drivers/video/aty: atyfb_base.c mach64_cursor.c 
        drivers/video/sis: sis_main.c 
        drivers/zorro  : gen-devlist.c 
        fs             : Config.in Makefile binfmt_aout.c block_dev.c 
                         buffer.c char_dev.c dquot.c exec.c super.c 
        fs/adfs        : map.c super.c 
        fs/cramfs      : Makefile inode.c uncompress.c 
        fs/devfs       : base.c 
        fs/isofs       : Makefile inode.c rock.c rock.h util.c 
        fs/jffs2       : background.c 
        fs/nfs         : nfs2xdr.c nfs3xdr.c 
        fs/ntfs        : dir.c 
        fs/ramfs       : inode.c 
        fs/reiserfs    : buffer2.c dir.c do_balan.c ibalance.c inode.c 
                         journal.c lbalance.c namei.c objectid.c 
                         prints.c stree.c super.c tail_conversion.c 
        include/asm-alpha: a.out.h floppy.h hwrpb.h pgtable.h 
        include/asm-arm: keyboard.h setup.h uaccess.h 
        include/asm-arm/arch-anakin: keyboard.h 
        include/asm-arm/arch-arc: keyboard.h 
        include/asm-arm/arch-cl7500: keyboard.h 
        include/asm-arm/arch-ebsa285: keyboard.h 
        include/asm-arm/arch-integrator: keyboard.h 
        include/asm-arm/arch-l7200: param.h 
        include/asm-arm/arch-nexuspci: keyboard.h 
        include/asm-arm/arch-rpc: keyboard.h 
        include/asm-arm/arch-sa1100: SA-1100.h SA-1111.h assabet.h 
                                     bitfield.h cerf.h graphicsclient.h 
                                     hardware.h keyboard.h simpad.h 
                                     system.h 
        include/asm-arm/arch-shark: dma.h hardware.h ide.h io.h irq.h 
                                    irqs.h keyboard.h memory.h param.h 
                                    system.h time.h timex.h uncompress.h 
        include/asm-arm/arch-tbox: keyboard.h 
        include/asm-arm/hardware: ep7212.h 
        include/asm-arm/proc-armv: cache.h uaccess.h 
        include/asm-i386: floppy.h io.h spinlock.h 
        include/asm-m68k: atarihw.h bitops.h floppy.h hardirq.h io.h 
                          mc146818rtc.h pgalloc.h pgtable.h raw_io.h 
                          semaphore.h serial.h softirq.h stat.h string.h 
                          sun3xflop.h system.h uaccess.h unistd.h 
                          zorro.h 
        include/asm-mips: floppy.h pci.h scatterlist.h 
        include/asm-mips64: floppy.h pci.h scatterlist.h 
        include/asm-ppc: atomic.h byteorder.h cache.h fads.h fcntl.h 
                         floppy.h io.h ivms8.h m48t35.h machdep.h 
                         mpc8xx.h oak.h pgtable.h ppcboot.h serial.h 
                         smplock.h spd8xx.h time.h uninorth.h unistd.h 
        include/asm-sparc: atomic.h bitops.h checksum.h floppy.h 
                           scatterlist.h semaphore.h spinlock.h system.h 
                           uaccess.h xor.h 
        include/asm-sparc64: floppy.h pgalloc.h pgtable.h xor.h 
        include/linux  : blkdev.h cdrom.h fs.h if.h if_arp.h if_ether.h 
                         iso_fs.h iso_fs_i.h iso_fs_sb.h lp.h mm.h 
                         netdevice.h ntfs_fs.h pagemap.h pci.h pci_ids.h 
                         reiserfs_fs.h sched.h skbuff.h sockios.h swap.h 
                         tcp.h timer.h 
        include/linux/netfilter_ipv4: ip_conntrack.h 
        include/net    : inet_ecn.h route.h sock.h tcp_ecn.h 
        kernel         : exec_domain.c ksyms.c printk.c softirq.c 
        mm             : Makefile filemap.c memory.c mmap.c oom_kill.c 
                         page_alloc.c page_io.c shmem.c swap.c 
                         swap_state.c swapfile.c vmscan.c 
        net            : Config.in Makefile netsyms.c 
        net/802        : Makefile 
        net/core       : Makefile dev.c dv.c 
        net/ethernet   : Makefile 
        net/ipv4       : Makefile af_inet.c ip_gre.c ip_sockglue.c 
                         ipconfig.c route.c syncookies.c 
                         sysctl_net_ipv4.c tcp.c tcp_input.c tcp_ipv4.c 
                         tcp_output.c 
        net/ipv4/netfilter: Config.in Makefile ip_conntrack_ftp.c 
                            ip_nat_ftp.c ip_tables.c ipt_LOG.c 
        net/ipv6/netfilter: Config.in Makefile ip6_tables.c ip6t_limit.c 
                            ip6t_mac.c ip6t_multiport.c 
        net/ipx        : Makefile 
        net/irda       : Makefile 
        net/packet     : af_packet.c 
        net/unix       : af_unix.c 
Added files:
        arch/alpha/lib : dec_and_lock.c 
        arch/arm/def-configs: adsbitsy cerfcube cerfpda cerfpod edb7211 
                              epxa10db graphicsmaster 
        arch/arm/mach-epxa10db: Makefile arch.c dma.c irq.c mm.c time.c 
        arch/arm/mach-sa1100: leds-adsbitsy.c pm.c sleep.S sleep.h 
        drivers/acpi/executer: exoparg1.c exoparg2.c exoparg3.c 
                               exoparg6.c 
        drivers/acpi/utilities: utmath.c 
        drivers/atm    : lanai.c 
        drivers/char   : eurotechwdt.c i8k.c 
        drivers/net/irda: ep7211_ir.c sa1100_ir.c 
        drivers/pcmcia : i82092.c i82092aa.h 
        fs/inflate_fs  : Makefile adler32.c infblock.c infblock.h 
                         infcodes.c infcodes.h inffast.c inffast.h 
                         inffixed.h inflate.c inflate_syms.c inftrees.c 
                         inftrees.h infutil.c infutil.h zconf.h zutil.h 
        fs/isofs       : compress.c zisofs.h 
        include/asm-arm/arch-epxa10db: dma.h excalibur.h hardware.h 
                                       int_ctrl00.h io.h irq.h irqs.h 
                                       memory.h mode_ctrl00.h param.h 
                                       platform.h pld_conf00.h serial.h 
                                       system.h time.h timer00.h timex.h 
                                       uart00.h uncompress.h vmalloc.h 
        include/asm-arm/hardware: ep7211.h 
        include/linux  : i8k.h if_vlan.h zlib_fs.h 
        include/linux/netfilter_ipv4: ip_conntrack_irc.h ipt_length.h 
                                      ipt_ttl.h 
        net/8021q      : Makefile vlan.c vlan.h vlan_dev.c vlanproc.c 
                         vlanproc.h 
        net/ipv4/netfilter: ip_conntrack_irc.c ip_nat_irc.c 
                            ip_nat_snmp_basic.c ipt_length.c ipt_ttl.c 
        net/ipv6/netfilter: ip6t_LOG.c ip6t_owner.c 
Removed files:
        arch/arm/def-configs: bitsy cerf 
        drivers/acpi   : driver.h 
        drivers/acpi/executer: exdyadic.c exmonad.c exxface.c 
        fs/cramfs/inflate: Makefile adler32.c infblock.c infblock.h 
                           infcodes.c infcodes.h inffast.c inffast.h 
                           inffixed.h inflate.c inftrees.c inftrees.h 
                           infutil.c infutil.h uncompr.c zconf.h zlib.h 
                           zutil.h 
        include/asm-mips: .pci.h.swp 

Log message:
        Merge with Linux 2.1.14.