Date: Thu, 22 Mar 2007 18:02:34 +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 dbxface.c hwsleep.c Message-ID: <200703221802.l2MI2ZDc041814@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
jkim 2007-03-22 18:02:34 UTC
FreeBSD src repository
Modified files:
sys/contrib/dev/acpica dbcmds.c dbxface.c hwsleep.c
Log:
Resolve conflicts from import of Intel ACPI-CA 20070320.
Revision Changes Path
1.19 +56 -52 src/sys/contrib/dev/acpica/dbcmds.c
1.10 +3 -3 src/sys/contrib/dev/acpica/dbxface.c
1.21 +84 -48 src/sys/contrib/dev/acpica/hwsleep.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703221802.l2MI2ZDc041814>