diff options
| author |   nicm <nicm@openbsd.org> | 2010-07-13 20:47:19 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-07-13 20:47:19 +0000 |
| commit | 50b68c3e7e3ba045abd01917b1efdcc52efebb29 (patch) | |
| tree | 06a765c3b4a4253c7cfdf76e78b21b6b4cc610e7 /sys/dev/acpi/acpiutil.c | |
| parent | PR 6423 fix for cvs too, requested by xsa@. (diff) | |
| download | wireguard-openbsd-50b68c3e7e3ba045abd01917b1efdcc52efebb29.tar.xz wireguard-openbsd-50b68c3e7e3ba045abd01917b1efdcc52efebb29.zip | |
Do not put the file into conflict if it is no longer modified (user has
edited it back to repository state).
ok zinovik
Diffstat (limited to 'sys/dev/acpi/acpiutil.c')
0 files changed, 0 insertions, 0 deletions