CVS: cvs.openbsd.org: src

[Theo de Raadt]

CVSROOT:        /cvs
Module name:    src
Changes by:     dera...@cvs.openbsd.org 2010/07/26 11:25:44

Modified files:
        sys/dev/acpi   : acpi.c 

Log message:
remove merge error which was commited