diff options
author | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
---|---|---|
committer | iwasaki <iwasaki@FreeBSD.org> | 2002-06-30 17:53:12 +0000 |
commit | e1150713a203c7b933939d575ea80f12c6877665 (patch) | |
tree | e90efa2f0b6a55e4114028b09fc286948d8516ea /usr.sbin | |
parent | 5577165db58ddb7157c690a8eabdb3df64d3ca38 (diff) | |
download | FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.zip FreeBSD-src-e1150713a203c7b933939d575ea80f12c6877665.tar.gz |
Resolve conflicts arising from the ACPI CA 20020404 import.
Diffstat (limited to 'usr.sbin')
0 files changed, 0 insertions, 0 deletions