summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2000-12-21 07:04:32 +0000
committermsmith <msmith@FreeBSD.org>2000-12-21 07:04:32 +0000
commit4b40c9999c4d400d6a2d421390b510397d71a4d9 (patch)
treea3280f0c89b158e6e9b9e4776439ae0df1989211 /sys/dev/acpica
parent07e76fb2a28476ae54bb108098c0707743ab398c (diff)
downloadFreeBSD-src-4b40c9999c4d400d6a2d421390b510397d71a4d9.zip
FreeBSD-src-4b40c9999c4d400d6a2d421390b510397d71a4d9.tar.gz
Resolve conflicts from the ACPI CA 20001215 vendor import.
Diffstat (limited to 'sys/dev/acpica')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud