[Midnightbsd-cvs] src: dev/aic7xxx: merge

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/dev/aic7xxx:
        aic79xx.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aic79xx.c?r1=1.4&r2=1.5)
        aic79xx_osm.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aic79xx_osm.h?r1=1.4&r2=1.5)
        aic79xx_pci.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aic79xx_pci.c?r1=1.2&r2=1.3)
        aic7xxx.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aic7xxx.c?r1=1.4&r2=1.5)
        aic7xxx_osm.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aic7xxx_osm.h?r1=1.4&r2=1.5)
        aic_osm_lib.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aic_osm_lib.c?r1=1.4&r2=1.5)
        aic_osm_lib.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aic_osm_lib.h?r1=1.4&r2=1.5)
    src/sys/dev/aic7xxx/aicasm:
        aicasm.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aicasm/aicasm.c?r1=1.2&r2=1.3)
        aicasm_symbol.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c?r1=1.2&r2=1.3)