remove merge error which was commited
authorderaadt <deraadt@openbsd.org>
Mon, 26 Jul 2010 17:25:44 +0000 (17:25 +0000)
committerderaadt <deraadt@openbsd.org>
Mon, 26 Jul 2010 17:25:44 +0000 (17:25 +0000)
commit85b1a3ecd6b5a0b46ddda46feb3e748f722c45bc
tree55465c9a825874bb59653b1500aae9c71e4a623b
parent8785928b2c327860825911de499c6047258b74b1
remove merge error which was commited
sys/dev/acpi/acpi.c