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        02/09/03 09:13:23

Modified files:
        .              : CREDITS Makefile 
        Documentation  : nbd.txt sonypi.txt 
        Documentation/kbuild: makefiles.txt 
        Documentation/video4linux: meye.txt 
        arch/alpha     : defconfig 
        arch/alpha/kernel: pci.c 
        arch/arm/def-configs: footbridge iq80310 shark 
        arch/arm/kernel: bios32.c 
        arch/i386      : Makefile defconfig 
        arch/i386/kernel: Makefile dmi_scan.c mtrr.c signal.c 
        arch/i386/lib  : Makefile mmx.c 
        arch/i386/math-emu: Makefile 
        arch/ia64      : defconfig 
        arch/ia64/kernel: pci.c 
        arch/ia64/sn/configs/sn1: defconfig-bigsur-mp 
                                  defconfig-bigsur-sp defconfig-dig-mp 
                                  defconfig-dig-sp defconfig-generic-mp 
                                  defconfig-generic-sp 
                                  defconfig-prom-medusa defconfig-sn1-mp 
                                  defconfig-sn1-mp-modules 
                                  defconfig-sn1-mp-syn1-0 
                                  defconfig-sn1-sp 
        arch/ia64/sn/configs/sn2: defconfig-dig-numa 
                                  defconfig-sn2-dig-mp 
                                  defconfig-sn2-dig-sp defconfig-sn2-mp 
                                  defconfig-sn2-mp-modules 
                                  defconfig-sn2-prom-medusa 
                                  defconfig-sn2-sp 
        arch/m68k      : config.in 
        arch/m68k/amiga: amiints.c chipram.c config.c 
        arch/m68k/apollo: config.c 
        arch/m68k/atari: ataints.c config.c stram.c time.c 
        arch/m68k/bvme6000: config.c rtc.c 
        arch/m68k/hp300: config.c time.c 
        arch/m68k/kernel: head.S process.c ptrace.c setup.c signal.c 
                          sun3-head.S time.c traps.c 
        arch/m68k/mac  : config.c misc.c 
        arch/m68k/math-emu: fp_emu.h multi_arith.h 
        arch/m68k/mvme147: config.c 
        arch/m68k/mvme16x: config.c 
        arch/m68k/q40  : config.c 
        arch/m68k/sun3 : config.c intersil.c 
        arch/m68k/sun3x: config.c time.c time.h 
        arch/mips      : defconfig-capcella defconfig-cobalt 
                         defconfig-ddb5476 defconfig-hp-lj 
                         defconfig-it8172 defconfig-ivr defconfig-pb1000 
                         defconfig-pb1100 defconfig-pb1500 
        arch/mips/cobalt: pci.c 
        arch/mips/ddb5074: pci.c 
        arch/mips/galileo-boards/ev64120: pci_bios.c 
        arch/mips/gt64120/common: pci.c 
        arch/mips/gt64120/momenco_ocelot: pci.c 
        arch/mips/kernel: pci.c 
        arch/mips/mips-boards/generic: pci.c 
        arch/mips/momentum/ocelot_g: pci-irq.c pci.c 
        arch/mips/sgi-ip27: ip27-pci.c 
        arch/mips/sgi-ip32: ip32-pci.c 
        arch/mips/sibyte/sb1250: pci.c 
        arch/mips/sni  : pci.c 
        arch/parisc/kernel: pci.c 
        arch/ppc       : Config.help Makefile config.in defconfig 
        arch/ppc/boot/simple: embed_config.c 
        arch/ppc/configs: apus_defconfig common_defconfig 
                          cpci405_defconfig k2_defconfig menf1_defconfig 
                          mvme5100_defconfig pmac_defconfig 
                          pplus_defconfig sandpoint_defconfig 
        arch/ppc/kernel: Makefile align.c btext.c cputable.c entry.S 
                         head.S head_4xx.S head_8xx.S i8259.c 
                         iSeries_head.S iSeries_misc.S idle.c l2cr.S 
                         misc.S mk_defs.c open_pic.c pci.c 
                         ppc4xx_setup.c ppc_ksyms.c process.c prom.c 
                         ptrace.c setup.c signal.c traps.c 
        arch/ppc/mm    : Makefile fault.c hashtable.S init.c 
                         mmu_context.c 
        arch/ppc/platforms: chrp_setup.c lopec_setup.c pmac_feature.c 
                            pmac_nvram.c pmac_pci.c pmac_pic.c 
                            pmac_setup.c pmac_smp.c prep_pci.c 
                            prep_setup.c 
        arch/ppc/xmon  : start.c xmon.c 
        arch/ppc64/kernel: ioctl32.c pci.c setup.c 
        arch/sh/kernel : pci_st40.c pcibios.c 
        arch/sparc/kernel: pcic.c sys_sunos.c 
        arch/sparc/mm  : sun4c.c 
        arch/sparc64   : defconfig 
        arch/sparc64/kernel: Makefile ioctl32.c pci.c setup.c signal.c 
                             signal32.c sparc64_ksyms.c sys_sunos32.c 
        arch/sparc64/lib: Makefile 
        arch/sparc64/mm: Makefile init.c 
        arch/sparc64/prom: Makefile 
        arch/sparc64/solaris: Makefile 
        arch/x86_64    : defconfig 
        arch/x86_64/ia32: ia32_ioctl.c 
        arch/x86_64/kernel: mtrr.c pci-x86_64.c 
        arch/x86_64/lib: mmx.c 
        drivers        : Makefile 
        drivers/acorn/block: mfmhd.c 
        drivers/acorn/scsi: arxescsi.c cumana_2.c oak.c 
        drivers/acpi   : acpi_osl.c 
        drivers/block  : amiflop.c cciss.c cpqarray.c floppy.c genhd.c 
                         ll_rw_blk.c ps2esdi.c swim3.c swim_iop.c 
                         z2ram.c 
        drivers/cdrom  : cdu31a.c 
        drivers/char   : Config.in Makefile acquirewdt.c advantechwdt.c 
                         amiserial.c ip2main.c moxa.c mxser.c random.c 
                         rocket.c serial.c serial167.c sonypi.c sonypi.h 
                         tty_io.c vt.c wdt285.c 
        drivers/char/agp: agp.h agpgart_be.c 
        drivers/char/drm: drm_agpsupport.h 
        drivers/char/pcmcia: Config.in Makefile 
        drivers/char/rio: rio_linux.c 
        drivers/hotplug: cpqphp_core.c cpqphp_pci.c ibmphp.h 
                         ibmphp_core.c ibmphp_ebda.c ibmphp_hpc.c 
                         pci_hotplug_core.c 
        drivers/i2c    : i2c-adap-ite.c 
        drivers/ide    : Config.help Config.in Makefile aec62xx.c 
                         alim15x3.c amd74xx.c buddha.c cmd64x.c cs5530.c 
                         cy82c693.c falconide.c hpt34x.c hpt366.c 
                         hptraid.c ide-cd.c ide-disk.c ide-dma.c 
                         ide-features.c ide-floppy.c ide-geometry.c 
                         ide-pci.c ide-pmac.c ide-probe.c ide-tape.c 
                         ide-taskfile.c ide.c it8172.c ns87415.c 
                         opti621.c pdc202xx.c pdc4030.c pdcadma.c 
                         pdcraid.c piix.c rz1000.c serverworks.c 
                         sis5513.c sl82c105.c tcq.c trm290.c via82cxxx.c 
        drivers/isdn/capi: capi.c kcapi.c 
        drivers/isdn/hardware/avm: b1.c b1dma.c b1isa.c b1pci.c 
                                   b1pcmcia.c c4.c t1isa.c t1pci.c 
        drivers/isdn/hysdn: hycapi.c 
        drivers/media/video: meye.c meye.h zr36120.c 
        drivers/message/fusion: Config.in 
        drivers/net    : Makefile acenic.c tg3.c tg3.h 
        drivers/pci    : Makefile pci-driver.c pci.c proc.c setup-bus.c 
                         setup-res.c 
        drivers/pcmcia : Makefile ds.c 
        drivers/s390/char: tubtty.c 
        drivers/scsi   : 53c7xx.c NCR53C9x.c a2091.c a3000.c aha1542.c 
                         aha1542.h amiga7xx.c atari_NCR5380.c 
                         atari_scsi.c blz1230.c blz2060.c bvme6000.c 
                         cpqfcTSinit.c cyberstorm.c cyberstormII.c 
                         fastlane.c g_NCR5380.c gvp11.c ide-scsi.c 
                         mac_NCR5380.c mac_esp.c mvme16x.c oktagon_esp.c 
                         osst.c osst.h sd.c sg.c sgiwd93.c sun3_scsi.c 
                         wd33c93.c 
        drivers/usb    : Config.in Makefile 
        drivers/usb/class: printer.c 
        drivers/usb/core: hub.h usb.c 
        drivers/usb/host: ehci-hcd.c ehci-q.c ehci-sched.c usb-ohci.c 
        drivers/usb/input: hid-core.c 
        drivers/usb/net: rtl8150.c usbnet.c 
        drivers/usb/serial: pl2303.c pl2303.h usbserial.c 
        drivers/zorro  : zorro.c zorro.ids 
        fs             : dcache.c dnotify.c open.c 
        fs/affs        : Changes bitmap.c file.c super.c 
        fs/exportfs    : expfs.c 
        fs/ext3        : namei.c super.c 
        fs/fat         : inode.c 
        fs/jffs        : Makefile 
        fs/jfs         : jfs_logmgr.c jfs_logmgr.h jfs_umount.c 
        fs/lockd       : svc4proc.c svcproc.c 
        fs/msdos       : namei.c 
        fs/nfs         : pagelist.c 
        fs/nfsd        : nfssvc.c 
        fs/nls         : nls_base.c nls_koi8-ru.c 
        fs/ntfs        : aops.c 
        fs/proc        : proc_misc.c 
        fs/reiserfs    : inode.c namei.c super.c 
        fs/ufs         : balloc.c 
        fs/vfat        : namei.c 
        include/asm-alpha: ide.h 
        include/asm-arm: ide.h 
        include/asm-cris: ide.h 
        include/asm-i386: ide.h 
        include/asm-ia64: ide.h 
        include/asm-m68k: bitops.h entry.h ide.h machdep.h 
                          motorola_pgalloc.h page.h pgalloc.h resource.h 
                          rtc.h sun3_pgalloc.h uaccess.h 
        include/asm-mips: ide.h 
        include/asm-mips64: ide.h 
        include/asm-parisc: ide.h 
        include/asm-ppc: cacheflush.h cputable.h hardirq.h heathrow.h 
                         i8259.h ide.h mediabay.h mpc10x.h open_pic.h 
                         page.h pgtable.h pmac_feature.h ppc_asm.h 
                         processor.h ptrace.h smplock.h softirq.h 
                         thread_info.h tlbflush.h unistd.h 
        include/asm-ppc64: ide.h 
        include/asm-s390: ide.h 
        include/asm-s390x: ide.h 
        include/asm-sh : ide.h 
        include/asm-sparc: ide.h 
        include/asm-sparc64: ide.h page.h pgtable.h thread_info.h 
        include/asm-x86_64: ide.h 
        include/linux  : agp_backend.h dnotify.h hdreg.h ide.h ioport.h 
                         kd.h kernelcapi.h pagemap.h pci.h pci_ids.h 
                         reiserfs_fs.h zorro.h 
        include/linux/isdn: capilli.h 
        include/math-emu: op-1.h op-2.h op-4.h op-common.h 
        include/net    : route.h 
        include/scsi   : sg.h 
        kernel         : fork.c ptrace.c resource.c signal.c 
        mm             : filemap.c page_io.c slab.c swapfile.c 
        net            : netsyms.c 
        net/core       : neighbour.c 
        net/ipv4       : arp.c route.c tcp.c 
        net/ipv4/netfilter: ipt_ULOG.c 
        net/ipv6       : Makefile 
        net/sunrpc     : svcsock.c 
        sound/oss/dmasound: dmasound_atari.c dmasound_awacs.c 
                            dmasound_core.c dmasound_paula.c 
                            dmasound_q40.c 
Added files:
        arch/i386/pci  : Makefile acpi.c changelog common.c direct.c 
                         fixup.c i386.c irq.c legacy.c numa.c pcbios.c 
                         pci.h visws.c 
        arch/ppc/kernel: asm-offsets.head 
        drivers/ide    : pcihost.h 
        drivers/message: Makefile 
        drivers/pci    : access.c hotplug.c pool.c power.c probe.c 
                         search.c 
        include/asm-m68k: cacheflush.h tlbflush.h 
        include/asm-ppc: zorro.h 
        net/ipv6       : ipv6_syms.c 
Removed files:
        arch/i386/kernel: pci-i386.c pci-i386.h pci-irq.c pci-pc.c 
                          pci-visws.c 
        arch/ppc/kernel: ppc_defs.head 
        drivers/ide    : ide-proc.c 
        include/linux/isdn: capidev.h 

Log message:
        Merge with Linux 2.5.15.