CVS Update@-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 03/07/14 13:23:58

Modified files:
        .              : MAINTAINERS Makefile 
        Documentation  : CodingStyle kernel-parameters.txt nbd.txt 
        Documentation/DocBook: procfs-guide.tmpl procfs_example.c 
        Documentation/filesystems: cifs.txt 
        arch/alpha     : Kconfig 
        arch/alpha/kernel: systbls.S time.c 
        arch/arm       : Kconfig 
        arch/arm26     : Kconfig 
        arch/i386      : Kconfig 
        arch/i386/kernel: entry.S microcode.c time.c 
        arch/ia64      : Kconfig 
        arch/ia64/kernel: time.c 
        arch/m68k/kernel: time.c 
        arch/m68knommu/kernel: time.c 
        arch/mips      : Kconfig-shared defconfig defconfig-atlas 
                         defconfig-capcella defconfig-cobalt 
                         defconfig-ddb5476 defconfig-ddb5477 
                         defconfig-decstation defconfig-e55 
                         defconfig-eagle defconfig-ev64120 
                         defconfig-ev96100 defconfig-hp-lj 
                         defconfig-ip22 defconfig-it8172 defconfig-ivr 
                         defconfig-jmr3927 defconfig-lasat200 
                         defconfig-malta defconfig-mpc30x 
                         defconfig-ocelot defconfig-osprey 
                         defconfig-pb1000 defconfig-pb1100 
                         defconfig-pb1500 defconfig-rm200 
                         defconfig-sb1250-swarm defconfig-sead 
                         defconfig-tb0226 defconfig-tb0229 
                         defconfig-workpad 
        arch/mips/kernel: syscalls.h time.c 
        arch/mips64    : defconfig defconfig-atlas defconfig-decstation 
                         defconfig-ip22 defconfig-ip27 defconfig-ip32 
                         defconfig-malta defconfig-rm200 
                         defconfig-sb1250-swarm defconfig-sead 
        arch/mips64/kernel: linux32.c scall_64.S scall_n32.S scall_o32.S 
                            time.c 
        arch/parisc    : Kconfig 
        arch/parisc/hpux: sys_hpux.c 
        arch/parisc/kernel: drivers.c ioctl32.c module.c pci.c 
                            sys_parisc32.c time.c traps.c unaligned.c 
        arch/ppc       : Kconfig 
        arch/ppc/kernel: time.c 
        arch/ppc64/kernel: time.c 
        arch/s390/kernel: time.c 
        arch/sh/kernel : time.c 
        arch/sparc     : defconfig 
        arch/sparc/boot: Makefile 
        arch/sparc/kernel: Makefile pcic.c process.c sys_sparc.c time.c 
        arch/sparc/mm  : srmmu.c 
        arch/sparc64   : Kconfig 
        arch/sparc64/kernel: entry.S sys_sparc.c sys_sparc32.c time.c 
        arch/v850/kernel: bug.c gbus_int.c simcons.c time.c 
        arch/x86_64    : Kconfig 
        arch/x86_64/boot: setup.S 
        arch/x86_64/ia32: ipc32.c 
        arch/x86_64/kernel: time.c x8664_ksyms.c 
        drivers/block  : Kconfig Makefile as-iosched.c floppy98.c 
                         ll_rw_blk.c loop.c nbd.c 
        drivers/char   : dtlk.c genrtc.c 
        drivers/char/agp: amd-k8-agp.c frontend.c hp-agp.c sis-agp.c 
                          via-agp.c 
        drivers/char/drm: ati_pcigart.h drm.h drmP.h drm_agpsupport.h 
                          drm_auth.h drm_bufs.h drm_context.h drm_dma.h 
                          drm_drawable.h drm_drv.h drm_fops.h drm_init.h 
                          drm_ioctl.h drm_lock.h drm_memory.h 
                          drm_memory_debug.h drm_os_linux.h drm_proc.h 
                          drm_sarea.h drm_scatter.h drm_stub.h drm_vm.h 
                          i810.h i810_dma.c i810_drm.h i810_drv.h r128.h 
                          r128_drv.h r128_state.c radeon.h radeon_drm.h 
                          radeon_drv.c radeon_drv.h radeon_state.c 
        drivers/eisa   : Kconfig 
        drivers/ide    : ide-cd.c 
        drivers/input/misc: gsc_ps2.c 
        drivers/isdn/hisax: isurf.c 
        drivers/net    : declance.c dgrs.c plip.c sb1250-mac.c sk_mca.c 
                         sundance.c sunhme.c tg3.c via-rhine.c 
        drivers/net/appletalk: cops.c ltpc.c 
        drivers/net/e100: e100_main.c e100_phy.c 
        drivers/net/hamradio: mkiss.c mkiss.h 
        drivers/net/irda: Kconfig irda-usb.c nsc-ircc.c old_belkin.c 
        drivers/net/pcmcia: 3c574_cs.c 3c589_cs.c axnet_cs.c ibmtr_cs.c 
                            nmclan_cs.c pcnet_cs.c smc91c92_cs.c 
                            xirc2ps_cs.c 
        drivers/net/tokenring: 3c359.c proteon.c skisa.c 
        drivers/net/wireless: atmel_cs.c wavelan.c 
        drivers/parisc : Kconfig 
        drivers/pcmcia : bulkmem.c cistpl.c cs.c cs_internal.h i82092.c 
                         i82365.c ricoh.h rsrc_mgr.c sa11xx_core.c 
                         tcic.c ti113x.h yenta_socket.c 
        drivers/scsi   : g_NCR5380.c 
        drivers/usb    : usb-skeleton.c 
        drivers/usb/class: usblp.c 
        drivers/usb/core: inode.c message.c 
        drivers/usb/net: usbnet.c 
        drivers/usb/serial: ftdi_sio.c ftdi_sio.h 
        drivers/usb/storage: datafab.c freecom.c initializers.c 
                             unusual_devs.h 
        drivers/video/sis: init301.c 
        fs             : aio.c attr.c binfmt_aout.c binfmt_elf.c 
                         block_dev.c buffer.c dcache.c direct-io.c 
                         eventpoll.c exec.c inode.c ioctl.c libfs.c 
                         locks.c mpage.c namei.c namespace.c open.c 
                         quota_v1.c read_write.c stat.c 
        fs/cifs        : CHANGES README cifs_debug.c cifsencrypt.c 
                         cifsfs.c cifsfs.h cifsproto.h cifssmb.c 
                         connect.c dir.c file.c inode.c misc.c 
                         smbencrypt.c transport.c 
        fs/devfs       : base.c 
        fs/ext2        : ialloc.c 
        fs/ext3        : inode.c 
        fs/jbd         : checkpoint.c commit.c journal.c transaction.c 
        fs/nfs         : inode.c write.c 
        fs/nfsd        : nfssvc.c 
        fs/proc        : base.c generic.c inode.c root.c 
        fs/reiserfs    : bitmap.c do_balan.c fix_node.c inode.c 
                         journal.c stree.c tail_conversion.c 
        include/asm-alpha: timex.h unistd.h 
        include/asm-generic: div64.h 
        include/asm-i386: unistd.h 
        include/asm-mips: unistd.h 
        include/asm-mips64: unistd.h 
        include/asm-parisc: byteorder.h parisc-device.h pgtable.h 
                            processor.h 
        include/asm-sparc: ipc.h pgtsrmmu.h 
        include/asm-sparc64: ipc.h ptrace.h thread_info.h 
        include/asm-v850: statfs.h 
        include/linux  : ac97_codec.h fs.h irda.h jbd.h loop.h mount.h 
                         nbd.h proc_fs.h reiserfs_fs.h reiserfs_fs_sb.h 
                         seqlock.h sysctl.h time.h 
        include/net    : ip6_route.h 
        include/net/irda: irda_device.h nsc-ircc.h 
        include/pcmcia : ss.h 
        init           : Kconfig version.c 
        ipc            : shm.c 
        kernel         : compat.c fork.c ksyms.c sched.c sys.c sysctl.c 
        lib            : vsprintf.c 
        mm             : filemap.c memory.c mmap.c nommu.c oom_kill.c 
                         readahead.c shmem.c swapfile.c vmscan.c 
        net            : compat.c netsyms.c 
        net/core       : net-sysfs.c 
        net/ipv4       : Kconfig Makefile igmp.c raw.c tcp_input.c udp.c 
        net/ipv4/netfilter: ip_fw_compat.c 
        net/ipv6       : ip6_fib.c ip6_output.c ndisc.c raw.c route.c 
                         udp.c 
        net/irda       : irlap.c irttp.c 
        net/irda/ircomm: ircomm_tty.c 
        net/irda/irnet : irnet_irda.c 
        net/netlink    : af_netlink.c 
        net/xfrm       : xfrm_policy.c 
        sound/oss      : Kconfig Makefile ac97_codec.c btaudio.c cmpci.c 
                         cs46xx.c cs46xx_wrapper-24.h es1370.c es1371.c 
                         esssolo1.c i810_audio.c ite8172.c maestro.c 
                         maestro3.c msnd_pinnacle.c nec_vrc5477.c 
                         nm256_audio.c sonicvibes.c soundcard.c 
                         trident.c trident.h via82cxxx_audio.c ymfpci.c 
                         ymfpci.h 
        sound/oss/dmasound: dmasound_core.c 
        sound/oss/emu10k1: efxmgr.c hwaccess.h main.c mixer.c 
Added files:
        drivers/block  : cryptoloop.c 
        include/net    : ip_vs.h 
        net/ipv4/ipvs  : Kconfig Makefile ip_vs_app.c ip_vs_conn.c 
                         ip_vs_core.c ip_vs_ctl.c ip_vs_dh.c ip_vs_est.c 
                         ip_vs_ftp.c ip_vs_lblc.c ip_vs_lblcr.c 
                         ip_vs_lc.c ip_vs_nq.c ip_vs_proto.c 
                         ip_vs_proto_ah.c ip_vs_proto_esp.c 
                         ip_vs_proto_icmp.c ip_vs_proto_tcp.c 
                         ip_vs_proto_udp.c ip_vs_rr.c ip_vs_sched.c 
                         ip_vs_sed.c ip_vs_sh.c ip_vs_sync.c ip_vs_wlc.c 
                         ip_vs_wrr.c ip_vs_xmit.c 
        scripts/genksyms: lex.c parse.c parse.h 
        sound/oss      : ac97_plugin_ad1980.c ad1889.c ad1889.h 
                         ali5455.c forte.c 

Log message:
        Merge with Linux 2.6.0-test1.