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

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/contrib/dev/acpica:
        acpica_prep.sh (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/dev/acpica/acpica_prep.sh?r1=1.2&r2=1.3)
        osunixxf.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/contrib/dev/acpica/osunixxf.c?r1=1.2&r2=1.3)