Date: Wed, 27 Nov 2002 10:09:20 -0800 (PST) From: Mitsuru IWASAKI <iwasaki@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acpiosxf.h acpixf.h acutils.h dbcmds.c dbfileio.c exfldio.c exsystem.c hwsleep.c psparse.c rscreate.c tbget.c utglobal.c src/sys/dev/acpica acpi_ec.c src/sys/dev/acpica/Osd OsdSynch.c ... Message-ID: <200211271809.gARI9KBu090441@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
iwasaki 2002/11/27 10:09:20 PST
Modified files:
sys/contrib/dev/acpica acconfig.h acpiosxf.h acpixf.h
acutils.h dbcmds.c dbfileio.c exfldio.c
exsystem.c hwsleep.c psparse.c
rscreate.c tbget.c utglobal.c
sys/dev/acpica acpi_ec.c
sys/dev/acpica/Osd OsdSynch.c
sys/sys ctype.h
Log:
Resolve conflicts arising from the ACPI CA 20021118 import.
Revision Changes Path
1.23 +6 -2 src/sys/contrib/dev/acpica/acconfig.h
1.12 +1 -1 src/sys/contrib/dev/acpica/acpiosxf.h
1.17 +1 -1 src/sys/contrib/dev/acpica/acpixf.h
1.6 +10 -1 src/sys/contrib/dev/acpica/acutils.h
1.5 +3 -4 src/sys/contrib/dev/acpica/dbcmds.c
1.7 +19 -1 src/sys/contrib/dev/acpica/dbfileio.c
1.14 +30 -16 src/sys/contrib/dev/acpica/exfldio.c
1.6 +5 -5 src/sys/contrib/dev/acpica/exsystem.c
1.8 +7 -1 src/sys/contrib/dev/acpica/hwsleep.c
1.19 +47 -48 src/sys/contrib/dev/acpica/psparse.c
1.7 +76 -52 src/sys/contrib/dev/acpica/rscreate.c
1.10 +1 -2 src/sys/contrib/dev/acpica/tbget.c
1.8 +20 -36 src/sys/contrib/dev/acpica/utglobal.c
1.16 +3 -3 src/sys/dev/acpica/Osd/OsdSynch.c
1.29 +2 -2 src/sys/dev/acpica/acpi_ec.c
1.3 +2 -1 src/sys/sys/ctype.h
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211271809.gARI9KBu090441>