CVS: cvs.openbsd.org: src

[Mike Belopuhov]

CVSROOT:        /cvs
Module name:    src
Changes by:     mi...@cvs.openbsd.org   2012/08/09 13:23:35

Modified files:
        sys/dev/pci    : if_oce.c ocevar.h 

Log message:
oops. missed these conflicts in the previous commit