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/07/09 08:23:05

Modified files:
        .              : CREDITS MAINTAINERS Makefile Rules.make 
        Documentation  : Changes oops-tracing.txt 
        Documentation/filesystems: Locking 
        Documentation/networking: 8139too.txt dl2k.txt 
        Documentation/usb: ibmcam.txt 
        arch/alpha     : Config.help defconfig 
        arch/alpha/kernel: entry.S setup.c signal.c 
        arch/alpha/mm  : fault.c 
        arch/arm       : Config.help 
        arch/arm/kernel: calls.S signal.c 
        arch/arm/mach-clps711x: dma.c 
        arch/cris      : Config.help cris.ld 
        arch/cris/drivers: eeprom.c usb-host.c 
        arch/cris/kernel: entry.S signal.c 
        arch/i386      : Config.help config.in defconfig vmlinux.lds 
        arch/i386/boot : bootsect.S 
        arch/i386/boot/compressed: Makefile 
        arch/i386/kernel: cpuid.c entry.S head.S i387.c init_task.c 
                          irq.c msr.c nmi.c pci-dma.c process.c ptrace.c 
                          semaphore.c setup.c signal.c smp.c smpboot.c 
                          traps.c 
        arch/i386/lib  : getuser.S 
        arch/ia64      : Config.help 
        arch/ia64/ia32 : sys_ia32.c 
        arch/ia64/kernel: entry.S signal.c sys_ia64.c 
        arch/ia64/sn/fprom: Makefile 
        arch/ia64/tools: Makefile 
        arch/m68k      : vmlinux-sun3.lds vmlinux.lds 
        arch/m68k/kernel: entry.S signal.c 
        arch/mips      : Config.help config.in defconfig defconfig-atlas 
                         defconfig-cobalt defconfig-ddb5476 
                         defconfig-ddb5477 defconfig-decstation 
                         defconfig-ev64120 defconfig-ev96100 
                         defconfig-hp-lj defconfig-ip22 defconfig-it8172 
                         defconfig-ivr defconfig-jmr3927 defconfig-malta 
                         defconfig-nino defconfig-ocelot 
                         defconfig-osprey defconfig-pb1000 
                         defconfig-pb1500 defconfig-rm200 
                         defconfig-sb1250-swarm 
        arch/mips/kernel: entry.S head.S init_task.c irixsig.c pci-dma.c 
                          process.c ptrace.c r2300_switch.S r4k_switch.S 
                          scall_o32.S setup.c signal.c syscalls.h 
                          sysirix.c 
        arch/mips/lib  : strlen_user.S strncpy_user.S strnlen_user.S 
        arch/mips/mm   : tlbex-r3k.S tlbex-r4k.S 
        arch/mips/tools: offset.c 
        arch/mips64    : Config.help config.in defconfig defconfig-atlas 
                         defconfig-ip22 defconfig-ip27 defconfig-ip32 
                         defconfig-malta defconfig-sb1250-swarm 
        arch/mips64/kernel: entry.S head.S init_task.c linux32.c 
                            process.c ptrace.c r4k_switch.S scall_64.S 
                            scall_o32.S signal.c signal32.c 
        arch/mips64/lib: strlen_user.S strncpy_user.S strnlen_user.S 
        arch/parisc/hpux: fs.c 
        arch/parisc/kernel: signal.c syscall.S 
        arch/ppc       : Config.help 
        arch/ppc/kernel: misc.S ppc_htab.c signal.c 
        arch/s390      : vmlinux-shared.lds vmlinux.lds 
        arch/s390/kernel: entry.S signal.c 
        arch/s390x     : vmlinux-shared.lds vmlinux.lds 
        arch/s390x/kernel: entry.S linux32.c signal.c signal32.c 
        arch/sh        : vmlinux.lds.S 
        arch/sh/kernel : entry.S signal.c 
        arch/sparc     : Config.help 
        arch/sparc/kernel: rtrap.S signal.c sys_sunos.c systbls.S 
        arch/sparc64   : Config.help Makefile config.in defconfig 
        arch/sparc64/kernel: Makefile binfmt_aout32.c binfmt_elf32.c 
                             entry.S etrap.S head.S init_task.c 
                             itlb_base.S pci_common.c pci_psycho.c 
                             process.c ptrace.c rtrap.S setup.c signal.c 
                             signal32.c smp.c sparc64_ksyms.c 
                             sys_sparc.c sys_sparc32.c sys_sunos32.c 
                             systbls.S trampoline.S traps.c ttable.S 
                             unaligned.c winfixup.S 
        arch/sparc64/lib: VIScopy.S VIScsum.S VISsave.S blockops.S 
                          checksum.S dec_and_lock.S 
        arch/sparc64/math-emu: math.c 
        arch/sparc64/mm: fault.c init.c ultra.S 
        arch/sparc64/solaris: entry64.S fs.c ioctl.c misc.c socket.c 
                              socksys.c timod.c 
        drivers        : Makefile 
        drivers/base   : core.c fs.c interface.c 
        drivers/block  : DAC960.h blkpg.c nbd.c ps2esdi.c smart1,2.h 
        drivers/bluetooth: hci_usb.c hci_vhci.c 
        drivers/char   : Config.in Makefile esp.c generic_serial.c lp.c 
                         mem.c nvram.c nwflash.c ppdev.c random.c 
                         serial.c serial_tx3912.c sh-sci.c sx.c 
                         synclink.c tpqic02.c vc_screen.c 
        drivers/char/agp: agp.h agpgart_be.c agpgart_fe.c 
        drivers/char/ftape/lowlevel: fdc-io.c 
        drivers/char/rio: rio_linux.c 
        drivers/hotplug: pci_hotplug_core.c 
        drivers/ide    : Config.help ide-disk.c ide-dma.c ide-proc.c 
                         ide-taskfile.c ide.c 
        drivers/ieee1394: pcilynx.c 
        drivers/input  : Config.help Config.in Makefile evdev.c input.c 
                         joydev.c keybdev.c mousedev.c 
        drivers/isdn   : Makefile isdn_audio.c isdn_common.c isdn_net.c 
        drivers/isdn/avmb1: capifs.c 
        drivers/isdn/hisax: elsa.c gazel.c hisax.h hisax_fcpcipnp.c 
                            st5481.h st5481_b.c st5481_d.c st5481_usb.c 
        drivers/macintosh: nvram.c 
        drivers/media/video: Config.in cpia_usb.c 
        drivers/message/i2o: i2o_block.c i2o_config.c i2o_core.c 
                             i2o_lan.c i2o_scsi.c 
        drivers/mtd    : mtdchar.c 
        drivers/net    : 3c501.c 3c503.c 3c505.c 3c507.c 3c509.c 3c515.c 
                         3c523.c 3c527.c 8139cp.c 8139too.c Config.help 
                         Config.in Makefile ac3200.c aironet4500_proc.c 
                         au1000_eth.c bsd_comp.c cs89x0.c defxx.c dl2k.c 
                         dl2k.h eepro100.c epic100.c fealnx.c hamachi.c 
                         hp100.c lance.c lasi_82596.c lne390.c mii.c 
                         natsemi.c ne3210.c ni52.c ni65.c ns83820.c 
                         pci-skeleton.c pcnet32.c rcpci45.c rrunner.c 
                         sk_g16.c slip.c starfire.c sundance.c tlan.c 
                         via-rhine.c winbond-840.c yellowfin.c 
        drivers/net/irda: irda-usb.c 
        drivers/net/pcmcia: 3c589_cs.c aironet4500_cs.c fmvj18x_cs.c 
                            xircom_tulip_cb.c 
        drivers/net/tulip: 21142.c ChangeLog timer.c tulip.h 
                           tulip_core.c 
        drivers/net/wan: comx.c 
        drivers/net/wan/lmc: lmc_main.c 
        drivers/net/wireless: airo.c 
        drivers/parport: ChangeLog daisy.c parport_pc.c share.c 
        drivers/pci    : pci.c proc.c 
        drivers/pcmcia : cardbus.c 
        drivers/pnp    : isapnp_proc.c pnpbios_core.c 
        drivers/sbus/char: flash.c jsflash.c sunkbd.c sunmouse.c 
        drivers/scsi   : 3w-xxxx.c 53c7,8xx.c 53c700.c 53c700.h 
                         53c700.scr AM53C974.c BusLogic.c NCR_D700.c 
                         advansys.c aha1542.c aha1740.c aic7xxx_old.c 
                         atp870u.c dpt_i2o.c eata.c eata_dma.c esp.c 
                         gdth.c ibmmca.c ide-scsi.c ini9100u.c inia100.c 
                         ips.c lasi700.c mca_53c9x.c megaraid.h osst.c 
                         pci2220i.c qla1280.c scsi.c scsi.h scsi_lib.c 
                         scsiiom.c seagate.c sg.c sim710.c st.c 
                         ultrastor.c wd7000.c 
        drivers/sound  : Config.in ite8172.c opl3sa2.c ymfpci.c 
        drivers/sound/cs4281: cs4281m.c 
        drivers/telephony: phonedev.c 
        drivers/usb    : CDCEther.c Config.help acm.c audio.c 
                         auerswald.c bluetooth.c catc.c dabusb.c 
                         devices.c devio.c drivers.c hcd.c hid-core.c 
                         hpusbscsi.c hub.c ibmcam.c inode.c kaweth.c 
                         mdc800.c microtek.c ov511.c pegasus.c printer.c 
                         pwc-if.c scanner.c se401.c stv680.c 
                         uhci-debug.h uhci.c usb-ohci.c usb-skeleton.c 
                         usb-uhci-debug.h usb-uhci.c usb-uhci.h usb.c 
                         usbkbd.c usbmouse.c usbnet.c usbvideo.c vicam.c 
                         wacom.c 
        drivers/usb/hcd: ehci-hcd.c ehci-hub.c ehci-mem.c ehci-q.c 
                         ehci-sched.c ohci-dbg.c ohci-hcd.c ohci-hub.c 
                         ohci-mem.c ohci-q.c ohci.h 
        drivers/usb/serial: belkin_sa.c cyberjack.c digi_acceleport.c 
                            empeg.c ftdi_sio.c io_edgeport.c ipaq.c 
                            ir-usb.c keyspan.c keyspan_pda.c 
                            kl5kusb105.c mct_u232.c omninet.c pl2303.c 
                            usbserial.c visor.c whiteheat.c 
        drivers/usb/storage: freecom.c isd200.c protocol.c scsiglue.c 
                             sddr09.c shuttle_usbat.c transport.c usb.c 
        drivers/video  : Config.in neofb.c 
        drivers/video/aty: mach64_accel.c 
        drivers/zorro  : proc.c 
        fs             : Config.in attr.c bad_inode.c binfmt_aout.c 
                         binfmt_elf.c binfmt_misc.c binfmt_script.c 
                         bio.c block_dev.c buffer.c dcache.c devices.c 
                         dquot.c exec.c fifo.c file.c file_table.c 
                         filesystems.c ioctl.c locks.c namespace.c 
                         pipe.c read_write.c readdir.c select.c stat.c 
                         super.c 
        fs/adfs        : dir.c dir_f.c dir_fplus.c file.c inode.c 
                         super.c 
        fs/affs        : amigaffs.c bitmap.c file.c inode.c namei.c 
                         super.c 
        fs/autofs      : autofs_i.h init.c inode.c root.c waitq.c 
        fs/autofs4     : autofs_i.h init.c inode.c root.c waitq.c 
        fs/bfs         : dir.c inode.c 
        fs/coda        : cache.c coda_linux.c dir.c file.c inode.c 
                         pioctl.c psdev.c symlink.c sysctl.c upcall.c 
        fs/cramfs      : inode.c 
        fs/devfs       : base.c 
        fs/devpts      : inode.c 
        fs/driverfs    : inode.c 
        fs/efs         : inode.c super.c 
        fs/ext2        : balloc.c ext2.h file.c inode.c ioctl.c super.c 
        fs/ext3        : balloc.c file.c fsync.c ialloc.c inode.c 
                         ioctl.c namei.c super.c 
        fs/fat         : dir.c fatfs_syms.c file.c inode.c 
        fs/freevxfs    : vxfs_lookup.c vxfs_super.c 
        fs/hfs         : catalog.c extent.c file_cap.c file_hdr.c hfs.h 
                         mdb.c super.c 
        fs/hpfs        : buffer.c dir.c file.c hpfs_fn.h inode.c super.c 
        fs/inflate_fs  : infutil.h 
        fs/intermezzo  : cache.c dcache.c dir.c file.c journal_ext2.c 
                         journal_ext3.c journal_obdfs.c 
                         journal_reiserfs.c journal_xfs.c methods.c 
                         presto.c psdev.c super.c sysctl.c upcall.c 
        fs/isofs       : compress.c dir.c inode.c namei.c rock.c 
        fs/jbd         : checkpoint.c commit.c journal.c recovery.c 
                         revoke.c transaction.c 
        fs/jffs        : inode-v23.c intrep.c jffs_proc.c 
        fs/jffs2       : background.c dir.c gc.c super.c 
        fs/lockd       : clntlock.c lockd_syms.c svc.c svc4proc.c 
                         svclock.c svcproc.c svcshare.c svcsubs.c 
        fs/minix       : inode.c 
        fs/msdos       : msdosfs_syms.c namei.c 
        fs/ncpfs       : dir.c file.c inode.c ioctl.c mmap.c sock.c 
                         symlink.c 
        fs/nfs         : dir.c file.c flushd.c inode.c nfs2xdr.c 
                         nfs3proc.c nfs3xdr.c nfsroot.c pagelist.c 
                         proc.c read.c symlink.c write.c 
        fs/nfsd        : export.c nfs3proc.c nfs3xdr.c nfscache.c 
                         nfsctl.c nfsfh.c nfsproc.c nfssvc.c nfsxdr.c 
                         stats.c vfs.c 
        fs/ntfs        : fs.c 
        fs/openpromfs  : inode.c 
        fs/proc        : array.c base.c generic.c inode.c kmsg.c 
                         proc_devtree.c proc_misc.c proc_tty.c root.c 
        fs/qnx4        : bitmap.c file.c fsync.c inode.c namei.c 
        fs/ramfs       : inode.c 
        fs/reiserfs    : bitmap.c buffer2.c dir.c do_balan.c file.c 
                         fix_node.c ibalance.c inode.c ioctl.c 
                         item_ops.c journal.c lbalance.c namei.c 
                         objectid.c prints.c procfs.c stree.c super.c 
                         tail_conversion.c 
        fs/romfs       : inode.c 
        fs/smbfs       : cache.c dir.c file.c inode.c ioctl.c proto.h 
                         sock.c 
        fs/sysv        : ChangeLog super.c 
        fs/udf         : super.c symlink.c 
        fs/ufs         : balloc.c cylinder.c dir.c file.c ialloc.c 
                         inode.c namei.c super.c truncate.c 
        fs/umsdos      : dir.c emd.c inode.c ioctl.c namei.c rdir.c 
        fs/vfat        : namei.c vfatfs_syms.c 
        include/asm-alpha: scatterlist.h siginfo.h unistd.h 
        include/asm-arm: scatterlist.h siginfo.h 
        include/asm-cris: siginfo.h unistd.h 
        include/asm-i386: cpufeature.h current.h floppy.h hardirq.h 
                          highmem.h hw_irq.h i387.h io.h io_apic.h pci.h 
                          pgalloc.h processor.h rwlock.h rwsem.h 
                          scatterlist.h semaphore.h siginfo.h smp.h 
                          smplock.h softirq.h spinlock.h uaccess.h 
                          unistd.h xor.h 
        include/asm-ia64: scatterlist.h siginfo.h unistd.h 
        include/asm-m68k: scatterlist.h semaphore.h siginfo.h unistd.h 
        include/asm-mips: current.h floppy.h hardirq.h highmem.h io.h 
                          pci.h processor.h scatterlist.h siginfo.h 
                          smp.h smplock.h softirq.h spinlock.h 
                          stackframe.h timex.h uaccess.h unistd.h 
        include/asm-mips64: current.h floppy.h hardirq.h pci.h 
                            processor.h scatterlist.h siginfo.h smp.h 
                            smplock.h softirq.h stackframe.h uaccess.h 
                            unistd.h 
        include/asm-parisc: scatterlist.h semaphore.h siginfo.h 
                            spinlock.h unistd.h 
        include/asm-ppc: pci.h scatterlist.h siginfo.h unistd.h 
        include/asm-s390: scatterlist.h siginfo.h unistd.h 
        include/asm-s390x: scatterlist.h siginfo.h unistd.h 
        include/asm-sh : pci.h scatterlist.h siginfo.h unistd.h 
        include/asm-sparc: checksum.h scatterlist.h siginfo.h unistd.h 
        include/asm-sparc64: a.out.h bitops.h checksum.h current.h 
                             delay.h elf.h fpumacro.h hardirq.h 
                             mmu_context.h page.h pgalloc.h pgtable.h 
                             processor.h ptrace.h scatterlist.h 
                             sfp-machine.h siginfo.h smp.h smplock.h 
                             softirq.h spinlock.h system.h ttable.h 
                             uaccess.h unistd.h 
        include/linux  : affs_fs_i.h ax25.h bfs_fs_i.h brlock.h 
                         capability.h device.h efs_fs.h ext3_fs.h file.h 
                         fs.h fs_struct.h gameport.h generic_serial.h 
                         hfs_fs.h highmem.h hpfs_fs_sb.h in.h inet.h 
                         init_task.h input.h iso_fs_i.h kernel.h lp.h 
                         mm.h msdos_fs.h msdos_fs_i.h namespace.h 
                         ncp_fs.h net.h nfs_fs.h nfs_page.h pci.h 
                         pci_ids.h pm.h proc_fs.h quotaops.h 
                         reiserfs_fs.h reiserfs_fs_sb.h sched.h 
                         serialP.h serio.h shmem_fs.h skbuff.h slab.h 
                         smb.h smb_fs_i.h smp.h smp_lock.h sound.h 
                         spinlock.h stat.h swap.h time.h timex.h usb.h 
                         vmalloc.h 
        include/linux/nfsd: export.h 
        include/linux/sunrpc: svc.h xdr.h 
        include/net    : neighbour.h scm.h sock.h 
        init           : Config.in main.c 
        kernel         : exec_domain.c exit.c fork.c ksyms.c module.c 
                         panic.c pm.c sched.c signal.c sys.c sysctl.c 
                         time.c 
        lib            : crc32.c 
        lib/zlib_inflate: inflate_syms.c infutil.h 
        mm             : bootmem.c filemap.c mprotect.c mremap.c shmem.c 
                         slab.c swapfile.c 
        net            : socket.c 
        net/8021q      : vlanproc.c 
        net/atm        : proc.c 
        net/ax25       : af_ax25.c 
        net/ipv6       : icmp.c mcast.c ndisc.c 
        net/netlink    : netlink_dev.c 
        net/netrom     : af_netrom.c 
        net/packet     : af_packet.c 
        net/rose       : af_rose.c 
        net/sunrpc     : sched.c svc.c svcauth.c 
        net/unix       : af_unix.c garbage.c 
        net/wanrouter  : wanmain.c wanproc.c 
        net/x25        : af_x25.c 
        scripts        : header.tk 
Added files:
        Documentation  : preempt-locking.txt 
        drivers/input/gameport: Config.help Config.in Makefile cs461x.c 
                                emu10k1-gp.c gameport.c lightning.c 
                                ns558.c pcigame.c 
        drivers/input/joystick: Config.help Config.in Makefile a3d.c 
                                adi.c amijoy.c analog.c cobra.c db9.c 
                                gamecon.c gf2k.c grip.c iforce.c 
                                interact.c magellan.c sidewinder.c 
                                spaceball.c spaceorb.c stinger.c tmdc.c 
                                turbografx.c warrior.c 
        drivers/input/serio: Config.help Config.in Makefile serio.c 
                             serport.c 
        include/asm-i386: thread_info.h 
        include/asm-mips: thread_info.h 
        include/asm-mips64: thread_info.h 
        include/asm-sparc64: thread_info.h 
        include/linux  : err.h stringify.h thread_info.h zconf.h zutil.h 

Log message:
        Merge with Linux 2.5.4.