Date: Tue, 1 Nov 2005 22:28:49 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica dbcmds.c dbfileio.c dbxface.c dmopcode.c hwregs.c hwsleep.c uteval.c utglobal.c Message-ID: <200511012228.jA1MSnNL098660@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
jkim 2005-11-01 22:28:49 UTC
FreeBSD src repository
Modified files:
sys/contrib/dev/acpica dbcmds.c dbfileio.c dbxface.c
dmopcode.c hwregs.c hwsleep.c uteval.c
utglobal.c
Log:
Fix conflicts from import of Intel ACPI-CA 20051021
Revision Changes Path
1.16 +558 -147 src/sys/contrib/dev/acpica/dbcmds.c
1.13 +57 -24 src/sys/contrib/dev/acpica/dbfileio.c
1.9 +66 -42 src/sys/contrib/dev/acpica/dbxface.c
1.4 +15 -7 src/sys/contrib/dev/acpica/dmopcode.c
1.6 +70 -48 src/sys/contrib/dev/acpica/hwregs.c
1.20 +62 -54 src/sys/contrib/dev/acpica/hwsleep.c
1.6 +40 -15 src/sys/contrib/dev/acpica/uteval.c
1.19 +100 -160 src/sys/contrib/dev/acpica/utglobal.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511012228.jA1MSnNL098660>