[parisc-linux-cvs] linux-2.6 willy

[Matthew Wilcox]

CVSROOT:	/var/cvs
Module name:	linux-2.6
Changes by:	willy	04/04/04 09:30:24

Modified files:
	.              : CREDITS Makefile 
	Documentation/kbuild: makefiles.txt 
	Documentation/sound/alsa: ALSA-Configuration.txt 
	Documentation/sysctl: vm.txt 
	arch/alpha/boot: misc.c 
	arch/alpha/kernel: setup.c sys_nautilus.c 
	arch/alpha/lib : dec_and_lock.c 
	arch/alpha/mm  : numa.c 
	arch/arm       : Makefile 
	arch/arm/boot/compressed: Makefile 
	arch/arm/kernel: Makefile sys_arm.c 
	arch/arm/lib   : Makefile 
	arch/arm26/kernel: sys_arm.c 
	arch/i386/kernel: apm.c io_apic.c setup.c 
	arch/i386/kernel/acpi: boot.c 
	arch/i386/mm   : hugetlbpage.c 
	arch/ia64/mm   : hugetlbpage.c 
	arch/ia64/sn/fakeprom: fw-emu.c 
	arch/ia64/sn/io/sn2: pciio.c pic.c 
	arch/m68k/mvme16x: 16xints.c 
	arch/mips/kernel: sysirix.c 
	arch/ppc       : Kconfig 
	arch/ppc/boot/simple: relocate.S 
	arch/ppc/configs: ebony_defconfig walnut_defconfig 
	arch/ppc/kernel: align.c cputable.c entry.S head.S head_44x.S 
	                 pci.c ppc_ksyms.c process.c 
	arch/ppc/mm    : cachemap.c pgtable.c 
	arch/ppc64/kernel: HvCall.c entry.S head.S iSeries_VpdInfo.c 
	                   iSeries_iommu.c iSeries_pci.c iSeries_setup.c 
	                   iommu.c mf.c pSeries_iommu.c pSeries_lpar.c 
	                   pci_dma_direct.c pci_iommu.c pmac_iommu.c 
	                   prom.c rtas.c smp.c vio.c 
	arch/ppc64/mm  : hash_utils.c hugetlbpage.c init.c 
	arch/sh/mm     : hugetlbpage.c 
	arch/sparc     : defconfig 
	arch/sparc/kernel: entry.S head.S init_task.c module.c signal.c 
	                   sparc_ksyms.c sys_sunos.c traps.c 
	arch/sparc/lib : Makefile debuglocks.c 
	arch/sparc/math-emu: math.c 
	arch/sparc64/kernel: sparc64_ksyms.c 
	arch/sparc64/mm: hugetlbpage.c 
	arch/sparc64/solaris: timod.c 
	arch/x86_64/kernel: io_apic.c 
	drivers/acorn/char: Makefile 
	drivers/acpi   : bus.c osl.c pci_irq.c 
	drivers/acpi/sleep: proc.c 
	drivers/acpi/utilities: utglobal.c 
	drivers/block  : carmel.c cpqarray.c elevator.c loop.c 
	drivers/cdrom  : sbpcd.c 
	drivers/char   : dz.c qtronix.c vt.c 
	drivers/char/drm: drm_memory_debug.h gamma_context.h 
	drivers/char/ftape/compressor: lzrw3.c 
	drivers/char/mwave: smapi.c 
	drivers/fc4    : soc.h 
	drivers/ide/pci: trm290.c 
	drivers/input/joystick: gf2k.c 
	drivers/isdn/hardware/eicon: capifunc.c divasmain.c message.c 
	drivers/isdn/hisax: hisax_fcpcipnp.c niccy.c nj_s.c 
	drivers/media/video: zoran_driver.c 
	drivers/mtd/nand: nand.c 
	drivers/net    : acenic.h fealnx.c ibmveth.c mace.c typhoon.c 
	drivers/net/hamradio: hdlcdrv.c 
	drivers/net/sk98lin: skgepnmi.c 
	drivers/net/wan: pc300_drv.c 
	drivers/net/wireless: arlan-main.c atmel.c hermes.h 
	drivers/pci/hotplug: cpqphp_core.c pciehp_hpc.c 
	drivers/pcmcia : sa1100_pangolin.c 
	drivers/s390/net: qeth.c 
	drivers/s390/scsi: zfcp_erp.c 
	drivers/scsi   : cpqfcTSinit.c dec_esp.c dpt_i2o.c gdth.c 
	                 i91uscsi.c in2000.c mac53c94.c mesh.c pci2000.c 
	                 pci2220i.c qlogicfas.c qlogicfc.c qlogicisp.c 
	                 sata_via.c scsiiom.c wd33c93.c 
	drivers/scsi/aic7xxx: aic7770.c 
	drivers/usb/media: se401.c stv680.c 
	drivers/usb/serial: empeg.c mct_u232.c 
	drivers/video  : fbmon.c 
	drivers/video/aty: radeon_monitor.c 
	drivers/video/i810: i810_main.c 
	drivers/video/sis: init301.c 
	fs             : aio.c bio.c readdir.c 
	fs/cifs        : connect.c 
	fs/intermezzo  : file.c fileset.c journal.c journal_xfs.c 
	                 kml_reint.c psdev.c upcall.c 
	fs/jfs         : jfs_logmgr.c 
	fs/smbfs       : sock.c 
	fs/sysfs       : dir.c 
	fs/xfs         : xfs_attr_leaf.c xfs_dfrag.c xfs_inode.c 
	                 xfs_log.c xfs_log_priv.h xfs_macros.c 
	                 xfs_mount.c xfs_sb.h xfs_trans.c xfs_trans.h 
	                 xfs_vfsops.c xfs_vnodeops.c 
	fs/xfs/linux   : kmem.h mrlock.h xfs_aops.c xfs_file.c 
	                 xfs_ioctl.c xfs_iops.c 
	include/asm-alpha: elf.h module.h pci.h unistd.h 
	include/asm-generic: siginfo.h 
	include/asm-i386: acpi.h system.h 
	include/asm-ppc: cputable.h mmu_context.h reg.h reg_booke.h 
	include/asm-ppc64: abs_addr.h dma-mapping.h page.h pci.h vio.h 
	include/asm-ppc64/iSeries: HvCallEvent.h iSeries_pci.h 
	include/asm-s390: pgtable.h 
	include/asm-sparc: asmmacro.h smp.h 
	include/asm-sparc64: siginfo.h 
	include/asm-x86_64: siginfo.h 
	include/linux  : aio.h hugetlb.h inetdevice.h mm.h mmzone.h 
	                 pci_ids.h sched.h swapops.h syscalls.h sysctl.h 
	include/linux/netfilter_ipv4: ip_conntrack.h 
	include/sound  : ac97_codec.h cs8427.h pcm.h version.h 
	init           : main.c 
	kernel         : exec_domain.c signal.c softirq.c stop_machine.c 
	                 sysctl.c timer.c uid16.c 
	lib            : bitmap.c 
	mm             : mmap.c mprotect.c page_alloc.c pdflush.c 
	                 swapfile.c 
	net            : Makefile 
	net/atm        : mpoa_proc.c 
	net/ipv4       : devinet.c igmp.c tcp_ipv4.c 
	net/ipv4/netfilter: ip_nat_snmp_basic.c ip_nat_standalone.c 
	                    ipt_MASQUERADE.c ipt_REJECT.c 
	net/ipv6       : Makefile exthdrs.c ipv6_syms.c tcp_ipv6.c 
	net/irda       : irttp.c 
	net/irda/irlan : irlan_filter.c 
	net/key        : af_key.c 
	net/packet     : af_packet.c 
	net/sched      : sch_hfsc.c 
	net/sctp       : bind_addr.c sm_make_chunk.c socket.c 
	net/sunrpc/auth_gss: svcauth_gss.c 
	scripts        : Makefile.modpost modpost.c 
	scripts/basic  : fixdep.c 
	security       : commoncap.c dummy.c 
	security/selinux: hooks.c 
	sound/core     : pcm.c pcm_lib.c pcm_timer.c 
	sound/core/ioctl32: timer32.c 
	sound/core/seq/oss: seq_oss_synth.h 
	sound/i2c      : cs8427.c 
	sound/oss      : cs46xx.c i810_audio.c nec_vrc5477.c rme96xx.c 
	                 soundcard.c sys_timer.c 
	sound/parisc   : harmony.c 
	sound/pci      : intel8x0.c 
	sound/pci/ac97 : ac97_codec.c ac97_patch.c ac97_pcm.c 
	                 ac97_proc.c 
	sound/pci/au88x0: au88x0.h au88x0_synth.c 
	sound/pci/cs46xx: cs46xx.c dsp_spos.c 
	sound/pci/ice1712: delta.c ice1712.c ice1712.h 
	sound/pcmcia/pdaudiocf: pdaudiocf.c pdaudiocf_core.c 
	                        pdaudiocf_irq.c 
	sound/ppc      : powermac.c 
	sound/usb      : usbaudio.c usbaudio.h usbmidi.c 
Added files:
	Documentation/arm: memory.txt 
	Documentation/networking: packet_mmap.txt 
	Documentation/sound/alsa: Procfile.txt 
	net/ipv6       : exthdrs_core.c 

Log message:
merged to 2.6.5