[Midnightbsd-cvs] src: sys/isa: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/compat/linsysfs:
        linsysfs.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/compat/linsysfs/linsysfs.c?r1=1.2&r2=1.3)
    src/sys/gnu/fs/reiserfs:
        reiserfs_fs.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_fs.h?r1=1.2&r2=1.3)
        reiserfs_fs_i.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_fs_i.h?r1=1.2&r2=1.3)
        reiserfs_fs_sb.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_fs_sb.h?r1=1.2&r2=1.3)
        reiserfs_hashes.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_hashes.c?r1=1.2&r2=1.3)
        reiserfs_inode.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_inode.c?r1=1.2&r2=1.3)
        reiserfs_item_ops.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_item_ops.c?r1=1.2&r2=1.3)
        reiserfs_mount.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_mount.h?r1=1.2&r2=1.3)
        reiserfs_namei.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_namei.c?r1=1.2&r2=1.3)
        reiserfs_prints.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_prints.c?r1=1.2&r2=1.3)
        reiserfs_stree.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_stree.c?r1=1.2&r2=1.3)
        reiserfs_vfsops.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c?r1=1.2&r2=1.3)
        reiserfs_vnops.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/reiserfs/reiserfs_vnops.c?r1=1.2&r2=1.3)
    src/sys/gnu/fs/xfs:
        xfs_dfrag.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/xfs_dfrag.c?r1=1.2&r2=1.3)
        xfs_dir_leaf.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/xfs_dir_leaf.c?r1=1.2&r2=1.3)
        xfs_inode.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/xfs_inode.c?r1=1.2&r2=1.3)
        xfs_inode.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/xfs_inode.h?r1=1.2&r2=1.3)
        xfs_itable.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/xfs_itable.c?r1=1.2&r2=1.3)
        xfs_rw.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/xfs_rw.h?r1=1.2&r2=1.3)
        xfs_vnodeops.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/xfs_vnodeops.c?r1=1.2&r2=1.3)
    src/sys/gnu/fs/xfs/FreeBSD:
        xfs_buf.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c?r1=1.2&r2=1.3)
        xfs_buf.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h?r1=1.2&r2=1.3)
        xfs_compat.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h?r1=1.2&r2=1.3)
        xfs_freebsd_iget.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c?r1=1.2&r2=1.3)
        xfs_ioctl.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c?r1=1.2&r2=1.3)
        xfs_iops.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h?r1=1.2&r2=1.3)
        xfs_mountops.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c?r1=1.2&r2=1.3)
        xfs_mountops.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h?r1=1.2&r2=1.3)
        xfs_super.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_super.c?r1=1.2&r2=1.3)
        xfs_vfs.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c?r1=1.2&r2=1.3)
        xfs_vnode.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c?r1=1.2&r2=1.3)
        xfs_vnode.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h?r1=1.2&r2=1.3)
        xfs_vnops.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c?r1=1.3&r2=1.4)
    src/sys/gnu/fs/xfs/FreeBSD/support:
        debug.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h?r1=1.2&r2=1.3)
        kdb.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/support/kdb.c?r1=1.2&r2=1.3)
    src/sys/isa:
        isa_common.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/isa_common.c?r1=1.2&r2=1.3)
        isa_common.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/isa_common.h?r1=1.2&r2=1.3)
        isa_dmareg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/isa_dmareg.h?r1=1.2&r2=1.3)
        isahint.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/isahint.c?r1=1.2&r2=1.3)
        isareg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/isareg.h?r1=1.2&r2=1.3)
        isavar.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/isavar.h?r1=1.2&r2=1.3)
        pnp.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/pnp.c?r1=1.2&r2=1.3)
        pnpparse.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/pnpparse.c?r1=1.2&r2=1.3)
        pnpreg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/pnpreg.h?r1=1.2&r2=1.3)
        pnpvar.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/pnpvar.h?r1=1.2&r2=1.3)
        rtc.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/rtc.h?r1=1.2&r2=1.3)
        syscons_isa.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/syscons_isa.c?r1=1.2&r2=1.3)
        vga_isa.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/isa/vga_isa.c?r1=1.2&r2=1.3)

Added Files:
-----------
    src/sys/fs/hpfs:
        hpfs.h (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs.h?rev=1.3&content-type=text/x-cvsweb-markup)
        hpfs_alsubr.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs_alsubr.c?rev=1.3&content-type=text/x-cvsweb-markup)
        hpfs_ioctl.h (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs_ioctl.h?rev=1.3&content-type=text/x-cvsweb-markup)
        hpfs_lookup.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs_lookup.c?rev=1.3&content-type=text/x-cvsweb-markup)
        hpfs_subr.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs_subr.c?rev=1.3&content-type=text/x-cvsweb-markup)
        hpfs_subr.h (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs_subr.h?rev=1.3&content-type=text/x-cvsweb-markup)
        hpfs_vfsops.c (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs_vfsops.c?rev=1.3&content-type=text/x-cvsweb-markup)
        hpfs_vnops.c (r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfs_vnops.c?rev=1.4&content-type=text/x-cvsweb-markup)
        hpfsmount.h (r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/fs/hpfs/hpfsmount.h?rev=1.3&content-type=text/x-cvsweb-markup)
    src/sys/geom:
        geom_pc98.c (r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/geom/geom_pc98.c?rev=1.5&content-type=text/x-cvsweb-markup)
        geom_pc98_enc.c (r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/geom/geom_pc98_enc.c?rev=1.4&content-type=text/x-cvsweb-markup)
    src/sys/geom/part:
        g_part_pc98.c (r1.4)
        (http://cvsweb.midnightbsd.org/src/sys/geom/part/g_part_pc98.c?rev=1.4&content-type=text/x-cvsweb-markup)

Removed Files:
-------------
    src/sys/gnu/dev/sound/pci:
        csaimg.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/dev/sound/pci/csaimg.h)
        emu10k1-alsa.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/dev/sound/pci/emu10k1-alsa.h)
        maestro3_dsp.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/dev/sound/pci/maestro3_dsp.h)
        maestro3_reg.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/dev/sound/pci/maestro3_reg.h)
        p16v-alsa.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/dev/sound/pci/p16v-alsa.h)
        p17v-alsa.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/dev/sound/pci/p17v-alsa.h)
    src/sys/gnu/fs/ext2fs:
        COPYRIGHT.INFO
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO)
        ext2_alloc.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_alloc.c)
        ext2_balloc.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_balloc.c)
        ext2_bitops.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_bitops.h)
        ext2_bmap.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_bmap.c)
        ext2_extern.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_extern.h)
        ext2_fs.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_fs.h)
        ext2_fs_sb.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h)
        ext2_inode.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_inode.c)
        ext2_inode_cnv.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c)
        ext2_linux_balloc.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c)
        ext2_linux_ialloc.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c)
        ext2_lookup.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_lookup.c)
        ext2_mount.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_mount.h)
        ext2_readwrite.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_readwrite.c)
        ext2_subr.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_subr.c)
        ext2_vfsops.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_vfsops.c)
        ext2_vnops.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/ext2_vnops.c)
        fs.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/fs.h)
        i386-bitops.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/i386-bitops.h)
        inode.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/inode.h)
        sparc64-bitops.h
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/ext2fs/sparc64-bitops.h)
    src/sys/gnu/fs/xfs/FreeBSD:
        xfsdmapistubs.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c)
        xfsquotasstubs.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c)
        xfsrtstubs.c
        (http://cvsweb.midnightbsd.org/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c)
    src/sys/isa:
        orm.c
        (http://cvsweb.midnightbsd.org/src/sys/isa/orm.c)
    src/sys/netgraph/bluetooth/drivers/ubt:
        TODO
        (http://cvsweb.midnightbsd.org/src/sys/netgraph/bluetooth/drivers/ubt/TODO)