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

[laffer1 at midnightbsd.org]

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

Modified Files:
--------------
    src/sys/dev/bktr:
        bktr_audio.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_audio.c?r1=1.2&r2=1.3)
        bktr_card.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_card.c?r1=1.2&r2=1.3)
        bktr_core.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_core.c?r1=1.2&r2=1.3)
        bktr_i2c.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_i2c.c?r1=1.2&r2=1.3)
        bktr_i2c.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_i2c.h?r1=1.2&r2=1.3)
        bktr_mem.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_mem.c?r1=1.2&r2=1.3)
        bktr_os.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_os.c?r1=1.2&r2=1.3)
        bktr_reg.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_reg.h?r1=1.2&r2=1.3)
        bktr_tuner.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/bktr_tuner.c?r1=1.2&r2=1.3)
        ioctl_bt848.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/ioctl_bt848.h?r1=1.2&r2=1.3)
        ioctl_meteor.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/ioctl_meteor.h?r1=1.2&r2=1.3)
        msp34xx.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/sys/dev/bktr/msp34xx.c?r1=1.2&r2=1.3)