summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpi/acpiutil.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2010-07-13 20:47:56 +0000
committernicm <nicm@openbsd.org>2010-07-13 20:47:56 +0000
commit21d02a4b95bf7f266afa5587c336056d0cff37cb (patch)
tree1fe56d78cdf7aac425ab2aa5ad92c841c558b396 /sys/dev/acpi/acpiutil.c
parentDo not put the file into conflict if it is no longer modified (user has (diff)
downloadwireguard-openbsd-21d02a4b95bf7f266afa5587c336056d0cff37cb.tar.xz
wireguard-openbsd-21d02a4b95bf7f266afa5587c336056d0cff37cb.zip
regress for merge bug.
Diffstat (limited to 'sys/dev/acpi/acpiutil.c')
0 files changed, 0 insertions, 0 deletions