[parisc-linux-cvs] linux bame

Paul Bame bame@puffin.external.hp.com
Thu, 5 Jul 2001 15:31:37 -0600


CVSROOT:	/home/cvs/parisc
Module name:	linux
Changes by:	bame	01/07/05 15:31:37

Modified files:
	.              : CREDITS MAINTAINERS README REPORTING-BUGS 
	                 Rules.make 
	Documentation  : 00-INDEX Changes DMA-mapping.txt 
	                 SubmittingDrivers binfmt_misc.txt cciss.txt 
	                 devices.txt dnotify.txt ioctl-number.txt 
	                 isapnp.txt java.txt joystick-api.txt 
	                 kernel-doc-nano-HOWTO.txt kernel-docs.txt 
	                 kernel-parameters.txt magic-number.txt mca.txt 
	                 modules.txt mtrr.txt parport.txt pci.txt pm.txt 
	                 rtc.txt scsi-generic.txt sysrq.txt 
	Documentation/DocBook: Makefile kernel-api.tmpl 
	                       kernel-hacking.tmpl kernel-locking.tmpl 
	                       parportbook.tmpl 
	Documentation/arm: README 
	Documentation/arm/SA1100: Brutus 
	Documentation/fb: framebuffer.txt matroxfb.txt 
	Documentation/filesystems: 00-INDEX Locking ext2.txt hpfs.txt 
	                           ntfs.txt proc.txt udf.txt vfat.txt 
	Documentation/filesystems/devfs: ChangeLog README 
	Documentation/i2c: smbus-protocol 
	Documentation/i386: boot.txt 
	Documentation/ia64: efirtc.txt 
	Documentation/isdn: 00-INDEX INTERFACE README.HiSax 
	                    README.diversion README.eicon README.hfc-pci 
	                    README.hysdn 
	Documentation/kbuild: makefiles.txt 
	Documentation/networking: 00-INDEX 8139too.txt alias.txt 
	                          comx.txt cops.txt cs89x0.txt 
	                          decnet.txt ethertap.txt filter.txt 
	                          ip-sysctl.txt ipddp.txt olympic.txt 
	                          sk98lin.txt smc9.txt smctr.txt 
	                          tlan.txt tms380tr.txt tulip.txt 
	                          tuntap.txt vortex.txt wan-router.txt 
	                          wanpipe.txt 
	Documentation/powerpc: ppc_htab.txt smp.txt sound.txt 
	                       zImage_layout.txt 
	Documentation/s390: cds.txt 
	Documentation/sound: AWE32 Introduction MAD16 NM256 OPL3-SA2 
	                     Opti PAS16 README.OSS es1370 es1371 solo1 
	                     sonicvibes 
	Documentation/sysctl: vm.txt 
	Documentation/usb: hotplug.txt uhci.txt usb-serial.txt 
	Documentation/video4linux/bttv: CARDLIST Insmod-options README 
	                                Sound-FAQ 
	Documentation/vm: locking 
	arch/alpha/boot: bootloader.lds 
Added files:
	drivers/mtd/maps: elan-104nc.c iq80310.c netsc520.c nora.c 
	                  ocelot.c octagon-5066.c physmap.c pnc2000.c 
	                  rpxlite.c sa1100-flash.c sbc_gxx.c sc520cdp.c 
	                  sun_uflash.c vmax301.c 
	drivers/mtd    : mtdblock_ro.c nftlcore.c redboot.c 
	drivers/mtd/nand: Config.in Makefile nand.c nand_ecc.c spia.c 
	drivers/net    : fealnx.c gt96100eth.c gt96100eth.h 
	                 pci-skeleton.c saa9730.c saa9730.h sungem.c 
	                 sungem.h 
	drivers/net/irda: irda-usb.c 
	drivers/net/tokenring: tmsisa.c 
	drivers/net/wan: c101.c dscc4.c hd64570.h hd6457x.c hdlc.c n2.c 
	                 sdla_ft1.c wanpipe_multppp.c 
	drivers/net/wireless: Config.in Makefile README airo.c airo_cs.c 
	                      airport.c hermes.c hermes.h orinoco.c 
	                      orinoco.h orinoco_cs.c todo.txt 
	drivers/pcmcia : hd64465_ss.c 
	drivers/s390/block: dasd_3370_erp.c dasd_3990_erp.c 
	                    dasd_3990_erp.h dasd_9336_erp.c 
	                    dasd_9343_erp.c dasd_9343_erp.h dasd_diag.c 
	                    dasd_diag.h dasd_eckd.h dasd_fba.c 
	                    dasd_fba.h xpram.c xpram.h 
	drivers/s390   : ccwcache.c ebcdic.c idals.c s390dyn.c s390io.c 
	                 s390mach.c 
	drivers/s390/char: ctrlchar.c ctrlchar.h tape.c tape.h 
	                   tape3480.c tape3480.h tape3490.c tape3490.h 
	                   tape34xx.c tape34xx.h tapeblock.c tapeblock.h 
	                   tapechar.c tapechar.h tapedefs.h tuball.c 
	                   tubfs.c tubio.h tubtty.c tubttyaid.c 
	                   tubttybld.c tubttyrcl.c tubttyscl.c 
	                   tubttysiz.c 
	drivers/s390/net: ctcmain.c ctctty.c ctctty.h fsm.c fsm.h 
	                  netiucv.c 
	drivers/sbus/char: bbc_envctrl.c bbc_i2c.c bbc_i2c.h 
	                   cpwatchdog.c max1617.h riowatchdog.c 
	drivers/scsi/aic7xxx: Config.in Makefile aic7770.c 
	                      aic7770_linux.c aic7xxx.c aic7xxx.h 
	                      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 queue.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/scsi   : aic7xxx_old.c 
	drivers/scsi/aic7xxx_old: README.aic7xxx aic7xxx.h aic7xxx.reg 
	                          aic7xxx.seq aic7xxx_proc.c 
	                          aic7xxx_reg.h aic7xxx_seq.c 
	                          scsi_message.h sequencer.h 
	drivers/sound  : aci.h cs46xx_wrapper-24.h cs46xxpm-24.h 
	                 cs46xxpm.h maestro3.c maestro3.h 
	drivers/sound/cs4281: Makefile cs4281_hwdefs.h 
	                      cs4281_wrapper-24.c cs4281m.c 
	                      cs4281pm-24.c cs4281pm.h 
	drivers/usb    : catc.c pwc-ctrl.c pwc-if.c pwc-ioctl.h 
	                 pwc-misc.c pwc-uncompress.c pwc-uncompress.h 
	                 pwc.h pwc_kiara.h pwc_nala.h pwc_timon.h 
	                 se401.c se401.h 
	drivers/usb/serial: cyberjack.c io_16654.h io_edgeport.c 
	                    io_edgeport.h io_fw_boot.h io_fw_boot2.h 
	                    io_fw_down.h io_fw_down2.h io_ionsp.h 
	                    io_tables.h io_usbvend.h pl2303.c pl2303.h 
	drivers/usb/storage: unusual_devs.h 
	drivers/video  : dcfb.c epson1355fb.c maxinefb.c maxinefb.h 
	                 pmag-ba-fb.c pmag-ba-fb.h pmagb-b-fb.c 
	                 pmagb-b-fb.h 
	drivers/video/riva: accel.c rivafb.h 
	fs             : char_dev.c 
	fs/freevxfs    : Makefile vxfs.h vxfs_bmap.c vxfs_dir.h 
	                 vxfs_extern.h vxfs_fshead.c vxfs_fshead.h 
	                 vxfs_immed.c vxfs_inode.c vxfs_inode.h 
	                 vxfs_lookup.c vxfs_olt.c vxfs_olt.h vxfs_subr.c 
	                 vxfs_super.c 
	fs/nls         : nls_cp1251.c nls_cp1255.c nls_iso8859-13.c 
	                 nls_koi8-ru.c nls_koi8-u.c nls_tis-620.c 
	fs/reiserfs    : Makefile README bitmap.c buffer2.c dir.c 
	                 do_balan.c file.c fix_node.c hashes.c 
	                 ibalance.c inode.c ioctl.c item_ops.c journal.c 
	                 lbalance.c namei.c objectid.c prints.c resize.c 
	                 stree.c super.c tail_conversion.c version.c 
	fs/sysv        : itree.c super.c 
	include/asm-alpha: mmzone.h 
	include/asm-arm/arch-integrator: bits.h dma.h hardware.h io.h 
	                                 irq.h irqs.h keyboard.h 
	                                 memory.h param.h platform.h 
	                                 serial.h sizes.h system.h 
	                                 time.h timex.h uncompress.h 
	                                 vmalloc.h 
	include/asm-arm/arch-l7200: aux_reg.h gp_timers.h gpio.h 
	                            keyboard.h pmpcon.h pmu.h serial.h 
	                            sib.h sys-clock.h 
	include/asm-arm/arch-sa1100: graphicsclient.h pangolin.h 
	                             pcmcia.h 
	include/asm-arm/hardware: amba_kmi.h clps7111.h ep7212.h 
	include/asm-arm/mach: amba_kmi.h irq.h 
	include/asm-arm/proc-armo: pgalloc.h 
	include/asm-arm/proc-armv: pgalloc.h 
	include/asm-cris: a.out.h atomic.h axisflashmap.h bitops.h 
	                  bugs.h byteorder.h cache.h checksum.h 
	                  current.h delay.h div64.h dma.h elf.h errno.h 
	                  eshlibld.h etraxgpio.h etraxi2c.h fcntl.h 
	                  hardirq.h hdreg.h ide.h io.h ioctl.h ioctls.h 
	                  ipc.h ipcbuf.h irq.h locks.h mman.h mmu.h 
	                  mmu_context.h module.h msgbuf.h namei.h page.h 
	                  param.h pci.h pgalloc.h pgtable.h poll.h 
	                  posix_types.h processor.h ptrace.h resource.h 
	                  rtc.h segment.h semaphore-helper.h semaphore.h 
	                  sembuf.h setup.h shmbuf.h shmparam.h 
	                  sigcontext.h siginfo.h signal.h smp.h 
	                  smp_lock.h smplock.h socket.h sockios.h 
	                  softirq.h stat.h statfs.h string.h sv_addr.agh 
	                  sv_addr_ag.h svinto.h sync_serial.h system.h 
	                  termbits.h termios.h timex.h types.h uaccess.h 
	                  ucontext.h unaligned.h unistd.h user.h 
	include/asm-i386: rwsem.h 
	include/asm-ia64: kregs.h perfmon.h ucontext.h 
	include/asm-ia64/sn/pci: pciba.h 
	include/asm-ia64/sn: sn_sal.h sv.h 
	include/asm-m68k: mc146818rtc.h raw_io.h rtc.h sun3xflop.h 
	                  sun3xprom.h zorro.h 
	include/asm-mips: fpu_emulator.h it8712.h mips32_cache.h 
	                  riscos-syscall.h time.h tlb.h tx3912.h 
	include/asm-mips/it8172: it8172.h it8172_cir.h it8172_dbg.h 
	                         it8172_int.h it8172_lpc.h it8172_pci.h 
	include/asm-mips/pmc: ev64120.h ev64120int.h 
	include/asm-ppc: ivms8.h parport.h ppc4xx.h ppc4xx_serial.h 
	                 rpxhiox.h rwsem.h spd8xx.h tlb.h tqm8xx.h 
	include/asm-s390: ccwcache.h cpcmd.h dasd.h debug.h idals.h 
	                  s390_ext.h scatterlist.h sfp-machine.h 
	                  todclk.h vtoc.h 
	include/asm-s390x: a.out.h atomic.h bitops.h bugs.h byteorder.h 
	                   cache.h ccwcache.h chandev.h checksum.h 
	                   cpcmd.h current.h dasd.h debug.h delay.h 
	                   div64.h dma.h ebcdic.h elf.h errno.h fcntl.h 
	                   gdb-stub.h hardirq.h hdreg.h idals.h ide.h 
	                   init.h io.h ioctl.h ioctls.h ipc.h ipcbuf.h 
	                   irq.h lowcore.h mathemu.h mman.h mmu.h 
	                   mmu_context.h module.h msgbuf.h namei.h 
	                   page.h param.h pgalloc.h pgtable.h poll.h 
	                   posix_types.h processor.h ptrace.h queue.h 
	                   resource.h s390-gdbregs.h s390-regs-common.h 
	                   s390_ext.h s390dyn.h s390io.h s390mach.h 
	                   scatterlist.h segment.h semaphore.h sembuf.h 
	                   setup.h shmbuf.h shmparam.h sigcontext.h 
	                   siginfo.h signal.h sigp.h smp.h smplock.h 
	                   socket.h sockios.h softirq.h spinlock.h 
	                   stat.h statfs.h string.h system.h termbits.h 
	                   termios.h timex.h todclk.h types.h uaccess.h 
	                   ucontext.h unaligned.h unistd.h user.h vtoc.h 
	                   xor.h 
	include/asm-sh : bigsur.h dc_sysasic.h ec3104.h hd64465.h 
	                 hd64465_gpio.h io_bigsur.h io_cat68701.h 
	                 io_dc.h io_ec3104.h io_hd64465.h io_sh2000.h 
	                 keyboard-ec3104.h mc146818rtc.h pci-sh7751.h 
	                 serial-bigsur.h serial-ec3104.h 
	include/asm-sparc64: bbc.h chafsr.h chmctrl.h dcr.h dcu.h 
	                     estate.h isa.h rwsem.h watchdog.h 
	include/linux  : hdlc.h if_wanpipe.h if_wanpipe_common.h mii.h 
	                 netfilter_bridge.h reiserfs_fs.h 
	                 reiserfs_fs_i.h reiserfs_fs_sb.h 
	                 rwsem-spinlock.h rwsem.h sdla_asy.h 
	include/linux/isdn: tpam.h 
	include/linux/mtd: cfi_endian.h nand_ecc.h 
	include/linux/netfilter_ipv4: ip_conntrack_icmp.h ipt_TCPMSS.h 
	                              ipt_tcpmss.h 
	include/net/bluetooth: bluetooth.h bluez.h hci.h hci_core.h 
	                       hci_emu.h hci_uart.h hci_usb.h l2cap.h 
	                       l2cap_core.h 
	include/net/irda: irda-usb.h 
	include/net    : syncppp.h 
	lib            : rwsem-spinlock.c rwsem.c 
	net/bluetooth  : Config.in Makefile af_bluetooth.c hci_core.c 
	                 hci_sock.c l2cap_core.c l2cap_proc.c lib.c 
	                 syms.c 
	net/ipv4/netfilter: ip_nat_helper.c ipt_TCPMSS.c ipt_tcpmss.c 
	net/ipv6/netfilter: ip6table_mangle.c 
	net/wanrouter  : af_wanpipe.c 
	scripts        : Lindent 

Log message:
cvs automerge to 2.4.6