summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoriwasaki <iwasaki@FreeBSD.org>2002-07-09 17:54:02 +0000
committeriwasaki <iwasaki@FreeBSD.org>2002-07-09 17:54:02 +0000
commit57bb0b6ca49cdd01098ab04fda81a87197188825 (patch)
treedfd1e75d9d7a42530736716ee1fc7c35f267f753 /etc
parent900789083d83b1bdef94797be7ef6652e6900546 (diff)
downloadFreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.zip
FreeBSD-src-57bb0b6ca49cdd01098ab04fda81a87197188825.tar.gz
Resolve conflicts arising from the ACPI CA 20020611 import.
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud