[parisc-linux-cvs] linux-2.5 willy

Matthew Wilcox parisc-linux@lists.parisc-linux.org
Sun, 22 Jun 2003 21:31:03 -0600 (MDT)


CVSROOT:	/var/cvs
Module name:	linux-2.5
Changes by:	willy	03/06/22 21:31:03

Modified files:
	.              : MAINTAINERS Makefile 
	Documentation  : kobject.txt sched-coding.txt 
	Documentation/usb: dma.txt 
	Documentation/vm: hugetlbpage.txt 
	arch/alpha     : Kconfig 
	arch/alpha/kernel: alpha_ksyms.c entry.S osf_sys.c srmcons.c 
	                   traps.c 
	arch/alpha/lib : memmove.S 
	arch/alpha/oprofile: common.c 
	arch/arm       : Kconfig vmlinux-armv.lds.in 
	arch/arm/common: Makefile 
	arch/arm/kernel: pm.c 
	arch/arm/lib   : lib1funcs.S 
	arch/arm/mach-integrator: core.c cpu.c 
	arch/arm/mach-sa1100: generic.c irq.c 
	arch/arm/mm    : fault-armv.c mm-armv.c 
	arch/arm/tools : mach-types 
	arch/arm26     : Kconfig 
	arch/cris      : Kconfig 
	arch/h8300     : Kconfig 
	arch/i386      : Kconfig 
	arch/i386/kernel: entry.S nmi.c process.c setup.c time.c traps.c 
	arch/i386/kernel/acpi: Makefile 
	arch/i386/mm   : hugetlbpage.c init.c 
	arch/i386/oprofile: Makefile init.c nmi_int.c 
	arch/i386/pci  : common.c direct.c fixup.c irq.c legacy.c numa.c 
	                 pcbios.c pci.h 
	arch/ia64      : Kconfig Makefile vmlinux.lds.S 
	arch/ia64/boot : bootloader.c 
	arch/ia64/hp/common: sba_iommu.c 
	arch/ia64/hp/sim: Kconfig Makefile hpsim_setup.c simserial.c 
	arch/ia64/ia32 : binfmt_elf32.c ia32_entry.S ia32_ioctl.c 
	                 ia32_ldt.c ia32_signal.c ia32_support.c 
	                 ia32_traps.c sys_ia32.c 
	arch/ia64/kernel: Makefile acpi-ext.c acpi.c efi_stub.S entry.S 
	                  entry.h fsys.S gate.S head.S ia64_ksyms.c 
	                  init_task.c irq.c ivt.S mca.c mca_asm.S 
	                  minstate.h module.c pal.S perfmon.c 
	                  perfmon_generic.h perfmon_itanium.h 
	                  perfmon_mckinley.h process.c ptrace.c setup.c 
	                  signal.c smpboot.c sys_ia64.c time.c traps.c 
	                  unaligned.c unwind.c 
	arch/ia64/lib  : Makefile idiv64.S memcpy_mck.S 
	arch/ia64/mm   : discontig.c fault.c hugetlbpage.c init.c tlb.c 
	arch/ia64/pci  : pci.c 
	arch/ia64/scripts: check-gas 
	arch/ia64/sn   : Makefile 
	arch/ia64/sn/fakeprom: README fpmem.c fpmem.h fpromasm.S 
	                       fw-emu.c klgraph_init.c main.c 
	                       make_textsym 
	arch/ia64/sn/io: Makefile ate_utils.c cdl.c io.c sgi_if.c 
	                 sgi_io_sim.c xswitch.c 
	arch/ia64/sn/io/sn2: Makefile bte_error.c klconflib.c klgraph.c 
	                     l1.c l1_command.c ml_SN_init.c ml_SN_intr.c 
	                     ml_iograph.c module.c pciio.c pic.c shub.c 
	                     shub_intr.c shuberror.c shubio.c xbow.c 
	                     xtalk.c 
	arch/ia64/sn/io/sn2/pcibr: Makefile pcibr_ate.c pcibr_config.c 
	                           pcibr_dvr.c pcibr_error.c 
	                           pcibr_hints.c pcibr_intr.c 
	                           pcibr_rrb.c pcibr_slot.c 
	arch/ia64/sn/kernel: Makefile bte.c irq.c machvec.c mca.c 
	                     probe.c setup.c sn_ksyms.c sv.c 
	arch/ia64/sn/kernel/sn2: Makefile cache.c io.c sn2_smp.c 
	                         sn_proc_fs.c 
	arch/m68k      : Kconfig 
	arch/m68knommu : Kconfig 
	arch/m68knommu/platform/5249: config.c 
	arch/m68knommu/platform/5249/MOTOROLA: crt0_ram.S 
	arch/m68knommu/platform/5272: config.c 
	arch/m68knommu/platform/5272/MOTOROLA: crt0_ram.S 
	arch/mips      : Kconfig 
	arch/mips64    : Kconfig 
	arch/parisc    : Kconfig 
	arch/ppc       : Kconfig 
	arch/ppc64     : Kconfig 
	arch/ppc64/kernel: process.c 
	arch/s390      : Kconfig 
	arch/sh        : Kconfig 
	arch/sparc     : Kconfig 
	arch/sparc/kernel: time.c 
	arch/sparc64   : Kconfig defconfig 
	arch/sparc64/kernel: time.c 
	arch/um        : Kconfig 
	arch/v850      : Kconfig vmlinux.lds.S 
	arch/x86_64    : Kconfig 
	drivers/acpi   : Kconfig Makefile osl.c pci_root.c 
	drivers/acpi/dispatcher: dsmthdat.c 
	drivers/acpi/events: evgpe.c evgpeblk.c 
	drivers/acpi/executer: exoparg1.c exstore.c exsystem.c exutils.c 
	drivers/acpi/hardware: hwregs.c hwsleep.c 
	drivers/acpi/tables: tbconvrt.c 
	drivers/acpi/utilities: utmisc.c 
	drivers/atm    : he.c 
	drivers/base   : Makefile sys.c 
	drivers/block  : cciss_scsi.c ll_rw_blk.c rd.c 
	drivers/char   : keyboard.c moxa.c raw.c vt.c vt_ioctl.c 
	drivers/i2c/busses: i2c-ali15x3.c i2c-i801.c 
	drivers/i2c/chips: Kconfig Makefile adm1021.c lm85.c w83781d.c 
	drivers/ide/pci: sis5513.c 
	drivers/ieee1394: sbp2.c 
	drivers/input/gameport: gameport.c 
	drivers/input/joystick: gamecon.c sidewinder.c 
	drivers/input/keyboard: atkbd.c 
	drivers/input/misc: uinput.c 
	drivers/input/mouse: Kconfig Makefile psmouse-base.c psmouse.h 
	                     synaptics.c synaptics.h 
	drivers/input/serio: ambakmi.c serio.c 
	drivers/isdn/act2000: Makefile 
	drivers/isdn/capi: Makefile 
	drivers/isdn/divert: Makefile 
	drivers/isdn/eicon: Makefile eicon_isa.c 
	drivers/isdn/hardware/avm: b1pci.c b1pcmcia.c t1pci.c 
	drivers/isdn/hardware/eicon: Makefile 
	drivers/isdn/hisax: Makefile avma1_cs.c 
	drivers/isdn/hysdn: Makefile hysdn_proclog.c 
	drivers/isdn/i4l: Makefile isdn_bsdcomp.c isdn_ppp_ccp.c 
	                  isdn_tty.c isdn_ttyfax.c 
	drivers/isdn/isdnloop: Makefile 
	drivers/isdn/pcbit: Makefile 
	drivers/isdn/sc: Makefile 
	drivers/isdn/tpam: Makefile tpam_queues.c 
	drivers/md     : dm-ioctl.c 
	drivers/message/i2o: i2o_scsi.c 
	drivers/net    : amd8111e.c myri_sbus.c pcnet32.c plip.c 
	                 ppp_async.c pppoe.c rcpci45.c shaper.c sis900.c 
	                 sundance.c 
	drivers/net/bonding: bond_main.c bonding.h 
	drivers/net/hamradio: baycom_epp.c yam.c 
	drivers/net/ixgb: ixgb_ethtool.c 
	drivers/net/pcmcia: xirc2ps_cs.c 
	drivers/net/tulip: Kconfig 
	drivers/net/wan: syncppp.c 
	drivers/net/wireless: airo.c atmel.c 
	drivers/oprofile: buffer_sync.c 
	drivers/pci    : bus.c hotplug.c pci-driver.c pci-sysfs.c pci.h 
	                 probe.c proc.c quirks.c search.c 
	drivers/pci/hotplug: acpiphp.h acpiphp_core.c acpiphp_glue.c 
	                     acpiphp_pci.c acpiphp_res.c 
	drivers/pcmcia : Makefile cistpl.c cs.c cs_internal.h i82365.c 
	                 rsrc_mgr.c 
	drivers/pnp    : base.h core.c interface.c manager.c quirks.c 
	                 resource.c support.c 
	drivers/pnp/isapnp: core.c 
	drivers/pnp/pnpbios: core.c 
	drivers/scsi   : 53c700.c 53c700.h AM53C974.c Kconfig 
	                 NCR53c406a.c NCR_D700.c aha152x.c aha1542.c 
	                 aha1740.c amiga7xx.c atp870u.c atp870u.h 
	                 blz1230.c bvme6000.c constants.c dc395x.c 
	                 dec_esp.c dpt_i2o.c dtc.c eata.c esp.c fd_mcs.c 
	                 fdomain.c hosts.c hosts.h ibmmca.c ide-scsi.c 
	                 imm.c ini9100u.c inia100.c ips.c jazz_esp.c 
	                 lasi700.c mac_esp.c megaraid.c megaraid.h 
	                 mesh.c mvme16x.c nsp32.c pas16.c pci2000.c 
	                 pci2220i.c ppa.c psi240i.c qlogicfas.c scsi.c 
	                 scsi.h scsi_debug.c scsi_devinfo.c scsi_error.c 
	                 scsi_ioctl.c scsi_lib.c scsi_module.c 
	                 scsi_priv.h scsi_proc.c scsi_scan.c scsi_syms.c 
	                 scsi_sysfs.c sd.c seagate.c sim710.c sr.c st.c 
	                 sun3x_esp.c sym53c416.c t128.c u14-34f.c 
	                 ultrastor.c wd7000.c 
	drivers/scsi/aacraid: aachba.c 
	drivers/scsi/aic7xxx: aic79xx_osm.c aic79xx_osm_pci.c 
	                      aic7xxx_osm.c 
	drivers/scsi/arm: acornscsi.c arxescsi.c cumana_1.c cumana_2.c 
	                  ecoscsi.c eesox.c fas216.c fas216.h oak.c 
	                  powertec.c 
	drivers/scsi/pcmcia: nsp_cs.c 
	drivers/serial : 8250_pnp.c Kconfig Makefile 
	drivers/telephony: ixj.c ixj.h 
	drivers/usb    : Makefile.lib 
	drivers/usb/class: audio.c bluetty.c cdc-acm.c usb-midi.c 
	                   usblp.c 
	drivers/usb/core: hcd.c hub.c message.c urb.c usb.c 
	drivers/usb/gadget: net2280.c 
	drivers/usb/host: ehci-dbg.c ehci-hcd.c ehci-q.c ehci.h 
	drivers/usb/image: hpusbscsi.c microtek.c 
	drivers/usb/input: aiptek.c hid-core.c kbtab.c powermate.c 
	                   usbkbd.c usbmouse.c wacom.c xpad.c 
	drivers/usb/misc: auerswald.c brlvger.c rio500.c rio500_usb.h 
	                  speedtch.c tiglusb.c usblcd.c usbtest.c 
	drivers/usb/net: Kconfig Makefile Makefile.mii catc.c kaweth.c 
	                 pegasus.c rtl8150.c usbnet.c 
	drivers/usb/storage: isd200.c protocol.c protocol.h scsiglue.c 
	                     scsiglue.h transport.c transport.h 
	                     unusual_devs.h usb.c usb.h 
	fs             : binfmt_elf.c compat.c fs-writeback.c libfs.c 
	                 namei.c open.c super.c 
	fs/adfs        : super.c 
	fs/affs        : super.c 
	fs/befs        : linuxvfs.c 
	fs/bfs         : inode.c 
	fs/cifs        : CHANGES asn1.c cifs_fs_sb.h cifsfs.c 
	                 cifsproto.h cifssmb.c connect.c file.c inode.c 
	                 misc.c netmisc.c transport.c 
	fs/coda        : inode.c upcall.c 
	fs/cramfs      : inode.c 
	fs/efs         : super.c 
	fs/ext2        : super.c 
	fs/ext3        : acl.c balloc.c bitmap.c dir.c file.c hash.c 
	                 ialloc.c inode.c ioctl.c namei.c super.c 
	                 xattr.c 
	fs/fat         : inode.c 
	fs/freevxfs    : vxfs_super.c 
	fs/hfs         : super.c 
	fs/hpfs        : hpfs_fn.h super.c 
	fs/hugetlbfs   : inode.c 
	fs/intermezzo  : intermezzo_fs.h 
	fs/isofs       : inode.c 
	fs/jbd         : checkpoint.c commit.c journal.c recovery.c 
	                 revoke.c transaction.c 
	fs/jfs         : super.c 
	fs/lockd       : svc.c 
	fs/minix       : inode.c 
	fs/ncpfs       : inode.c sock.c 
	fs/nfs         : inode.c 
	fs/nfsd        : auth.c export.c nfs3xdr.c nfs4proc.c 
	                 nfs4state.c nfs4xdr.c nfsctl.c nfsfh.c 
	                 nfsproc.c nfssvc.c nfsxdr.c vfs.c 
	fs/ntfs        : super.c 
	fs/partitions  : Kconfig acorn.c acorn.h check.c 
	fs/proc        : base.c kcore.c task_mmu.c 
	fs/qnx4        : inode.c 
	fs/reiserfs    : super.c 
	fs/romfs       : inode.c 
	fs/smbfs       : inode.c proc.c proto.h 
	fs/sysv        : inode.c 
	fs/udf         : super.c 
	fs/ufs         : super.c 
	fs/xfs         : xfs_vfsops.c 
	fs/xfs/linux   : xfs_super.c xfs_vfs.c xfs_vfs.h 
	include/acpi   : acconfig.h acglobal.h achware.h acpiosxf.h 
	                 actypes.h 
	include/asm-alpha: pci.h smp.h statfs.h unistd.h xor.h 
	include/asm-arm: memory.h statfs.h 
	include/asm-arm/proc-armv: uaccess.h 
	include/asm-cris: statfs.h 
	include/asm-h8300: statfs.h uaccess.h 
	include/asm-i386: acpi.h apic.h genapic.h processor.h smp.h 
	                  statfs.h uaccess.h unistd.h 
	include/asm-i386/mach-default: mach_resources.h 
	include/asm-i386/mach-generic: mach_apic.h 
	include/asm-i386/mach-pc9800: setup_arch_pre.h 
	include/asm-ia64: a.out.h asmmacro.h compat.h elf.h ia32.h io.h 
	                  kregs.h machvec.h mca.h mca_asm.h nodedata.h 
	                  page.h pci.h perfmon.h pgalloc.h pgtable.h 
	                  processor.h ptrace.h ptrace_offsets.h 
	                  resource.h sal.h sigcontext.h siginfo.h smp.h 
	                  spinlock.h statfs.h system.h thread_info.h 
	                  timex.h tlb.h topology.h unistd.h unwind.h 
	                  xor.h 
	include/asm-ia64/sn: addrs.h alenlist.h arch.h ate_utils.h bte.h 
	                     cdl.h clksupport.h dmamap.h driver.h 
	                     fetchop.h geo.h hcl.h hcl_util.h 
	                     ifconfig_net.h intr.h invent.h io.h ioc3.h 
	                     ioerror.h ioerror_handling.h iograph.h 
	                     klclock.h klconfig.h kldir.h labelcl.h 
	                     leds.h mmtimer_private.h module.h nag.h 
	                     nodepda.h pda.h pio.h prio.h router.h sgi.h 
	                     simulator.h slotnum.h sn_cpuid.h sn_fru.h 
	                     sn_private.h sn_sal.h sndrv.h sv.h 
	                     systeminfo.h types.h uart16550.h vector.h 
	include/asm-ia64/sn/arc: hinv.h types.h 
	include/asm-ia64/sn/ksys: elsc.h l1.h 
	include/asm-ia64/sn/pci: bridge.h pci_bus_cvlink.h pci_defs.h 
	                         pcibr.h pcibr_private.h pciio.h 
	                         pciio_private.h 
	include/asm-ia64/sn/sn2: addrs.h arch.h intr.h io.h shub.h 
	                         shub_md.h shub_mmr.h shub_mmr_t.h 
	                         shubio.h slotnum.h sn_private.h 
	include/asm-ia64/sn/xtalk: xbow.h xbow_info.h xswitch.h xtalk.h 
	                           xtalk_private.h xtalkaddrs.h 
	                           xwidget.h 
	include/asm-m68k: statfs.h 
	include/asm-m68knommu: uaccess.h 
	include/asm-parisc: compat.h smp.h statfs.h 
	include/asm-ppc: pci.h smp.h statfs.h 
	include/asm-ppc64: compat.h pci.h statfs.h 
	include/asm-s390: smp.h 
	include/asm-sparc: statfs.h xor.h 
	include/asm-sparc64: pci.h smp.h statfs.h xor.h 
	include/asm-v850: hardirq.h io.h 
	include/asm-x86_64: compat.h smp.h statfs.h 
	include/linux  : acpi.h atmdev.h bitops.h coda_psdev.h efs_fs.h 
	                 ext3_fs.h ext3_fs_i.h ext3_fs_sb.h ext3_jbd.h 
	                 fs.h gfp.h highmem.h hugetlb.h input.h isdn.h 
	                 isdn_ppp.h jbd.h journal-head.h msdos_fs.h 
	                 netdevice.h netfilter_arp.h page-flags.h pci.h 
	                 pci_ids.h pnp.h rmap-locking.h sched.h sem.h 
	                 serio.h skbuff.h smbno.h spinlock.h sysdev.h 
	                 tcp.h time.h timex.h usb.h vfs.h 
	include/linux/nfsd: nfsd.h state.h xdr.h xdr3.h 
	include/linux/sunrpc: cache.h svc.h 
	include/net    : llc_pdu.h sock.h syncppp.h tcp.h 
	include/net/sctp: structs.h 
	ipc            : sem.c util.c 
	kernel         : acct.c compat.c exit.c fork.c kmod.c ksyms.c 
	                 sched.c timer.c workqueue.c 
	lib            : kobject.c 
	mm             : page-writeback.c shmem.c slab.c swap_state.c 
	net            : netsyms.c 
	net/atm        : clip.c common.c common.h lec.c mpoa_caches.c 
	                 pvc.c resources.c resources.h signaling.c svc.c 
	net/bluetooth  : af_bluetooth.c 
	net/bridge     : br_netfilter.c 
	net/core       : dev.c flow.c skbuff.c 
	net/decnet     : af_decnet.c 
	net/econet     : af_econet.c 
	net/ethernet   : eth.c 
	net/ipv4       : arp.c igmp.c ip_output.c raw.c tcp.c tcp_ipv4.c 
	                 tcp_minisocks.c udp.c 
	net/ipv4/netfilter: arp_tables.c arptable_filter.c ipt_MIRROR.c 
	net/ipv6       : icmp.c ip6_output.c ip6_tunnel.c mcast.c 
	                 ndisc.c raw.c tcp_ipv6.c udp.c xfrm6_policy.c 
	net/ipx        : af_ipx.c 
	net/irda       : irda_device.c irttp.c 
	net/irda/irnet : irnet_irda.c irnet_ppp.c 
	net/key        : af_key.c 
	net/llc        : llc_c_ac.c llc_c_ev.c llc_conn.c llc_evnt.c 
	                 llc_s_ev.c llc_sap.c 
	net/netlink    : af_netlink.c 
	net/packet     : af_packet.c 
	net/sched      : sch_htb.c 
	net/sctp       : endpointola.c socket.c 
	net/sunrpc     : cache.c sched.c svc.c svcauth_unix.c svcsock.c 
	net/unix       : af_unix.c 
	net/wanrouter  : af_wanpipe.c 
	net/x25        : af_x25.c 
	scripts/kconfig: mconf.c 
	sound/pci/korg1212: korg1212.c 
	usr            : gen_init_cpio.c 
Added files:
	Documentation/firmware_class: README firmware_sample_driver.c 
	                              firmware_sample_firmware_class.c 
	                              hotplug-script 
	arch/arm/common: amba.c icst525.c 
	arch/i386/kernel/acpi: acpitable.c acpitable.h 
	arch/i386/oprofile: nmi_timer_int.c 
	arch/ia64/ia32 : ia32priv.h 
	arch/ia64/kernel: asm-offsets.c gate-data.S gate.lds.S patch.c 
	                  perfmon_default_smpl.c 
	arch/ia64/lib  : xor.S 
	arch/ia64/scripts: check-segrel.S check-segrel.lds 
	                   toolchain-flags 
	arch/ia64/sn/io/drivers: Makefile ifconfig_net.c ioconfig_bus.c 
	arch/ia64/sn/io/hwgfs: Makefile hcl.c hcl_util.c interface.c 
	                       invent_stub.c labelcl.c ramfs.c 
	arch/ia64/sn/io/machvec: Makefile iomv.c pci.c pci_bus_cvlink.c 
	                         pci_dma.c 
	arch/ia64/sn/io/platform_init: Makefile irix_io_init.c 
	                               sgi_io_init.c 
	arch/ia64/sn/io/sn2: kdba_io.c 
	arch/ia64/sn/kernel: idle.c 
	arch/ia64/sn/kernel/sn2: prominfo_proc.c timer.c 
	drivers/acpi   : asus_acpi.c 
	drivers/base   : Kconfig firmware_class.c 
	drivers/i2c/chips: lm78.c 
	drivers/input/mouse: logips2pp.c logips2pp.h 
	drivers/pcmcia : yenta_socket.c yenta_socket.h 
	drivers/scsi   : scsi_typedefs.h 
	drivers/usb/net: ax8817x.c 
	fs             : Kconfig.binfmt 
	include/asm-arm/hardware: amba.h icst525.h 
	include/asm-generic: statfs.h 
	include/asm-ia64: ioctl32.h patch.h perfmon_default_smpl.h 
	                  ustack.h 
	include/asm-ia64/sn: hwgfs.h ioc4.h 
	include/linux  : firmware.h statfs.h 
	include/scsi   : scsi_cmnd.h scsi_device.h scsi_eh.h scsi_host.h 
	                 scsi_request.h scsi_tcq.h 
Removed files:
	arch/ia64/sn/io: alenlist.c eeprom.c efi-rtc.c hcl.c hcl_util.c 
	                 hubdev.c hubspc.c ifconfig_net.c invent.c 
	                 ioconfig_bus.c klconflib.c klgraph.c 
	                 klgraph_hack.c l1.c l1_command.c labelcl.c 
	                 ml_SN_init.c ml_iograph.c module.c pci.c 
	                 pci_bus_cvlink.c pci_dma.c pciba.c pciio.c 
	                 sgi_io_init.c stubs.c xbow.c xtalk.c 
	arch/ia64/sn/io/sn1: hub_intr.c hubcounters.c huberror.c ip37.c 
	                     mem_refcnt.c ml_SN_intr.c pcibr.c 
	arch/ia64/sn/io/sn2: pci_bus_cvlink.c sgi_io_init.c 
	arch/ia64/sn/io/sn2/pcibr: pcibr_idbg.c 
	arch/ia64/sn/kernel: iomv.c llsc4.c llsc4.h misctest.c sn_asm.S 
	arch/ia64/sn/kernel/sn1: Makefile cache.c error.c iomv.c 
	                         sn1_smp.c synergy.c 
	arch/ia64/sn/kernel/sn2: iomv.c 
	arch/ia64/tools: Makefile print_offsets.awk print_offsets.c 
	drivers/pcmcia : yenta.c yenta.h 
	drivers/scsi   : eata.h u14-34f.h 
	include/asm-ia64/sn: bte_copy.h eeprom.h gda.h hack.h 
	                     hires_clock.h idle.h intr_public.h mca.h 
	                     nic.h pio_flush.h sn_pio_sync.h snconfig.h 
	include/asm-ia64/sn/pci: pciba.h 
	include/asm-ia64/sn/sn1: addrs.h arch.h bedrock.h hubdev.h 
	                         hubio.h hubio_next.h hublb.h 
	                         hublb_next.h hubmd.h hubmd_next.h 
	                         hubni.h hubni_next.h hubpi.h 
	                         hubpi_next.h hubspc.h hubstat.h hubxb.h 
	                         hubxb_next.h hwcntrs.h intr.h 
	                         intr_public.h ip27config.h mem_refcnt.h 
	                         mmzone_sn1.h slotnum.h sn_private.h 
	                         synergy.h 
	include/asm-ia64/sn/sn2: mmzone_sn2.h 

Log message:
merged 2.5.73