Date: Tue, 29 Apr 2003 12:11:00 -0700 (PDT) From: Nate Lawson <njl@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h acpi.h acpiosxf.h acpixf.h acutils.h dbcmds.c dbxface.c exfldio.c exsystem.c hwsleep.c psparse.c rscreate.c tbget.c utglobal.c Message-ID: <200304291911.h3TJB0E2076851@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
njl 2003/04/29 12:11:00 PDT
FreeBSD src repository
Modified files:
sys/contrib/dev/acpica acconfig.h acenv.h acfreebsd.h acgcc.h
acpi.h acpiosxf.h acpixf.h acutils.h
dbcmds.c dbxface.c exfldio.c exsystem.c
hwsleep.c psparse.c rscreate.c tbget.c
utglobal.c
Log:
Resolve conflicts.
Revision Changes Path
1.24 +35 -34 src/sys/contrib/dev/acpica/acconfig.h
1.5 +5 -7 src/sys/contrib/dev/acpica/acenv.h
1.14 +7 -3 src/sys/contrib/dev/acpica/acfreebsd.h
1.19 +9 -2 src/sys/contrib/dev/acpica/acgcc.h
1.4 +2 -2 src/sys/contrib/dev/acpica/acpi.h
1.13 +43 -6 src/sys/contrib/dev/acpica/acpiosxf.h
1.18 +24 -3 src/sys/contrib/dev/acpica/acpixf.h
1.7 +61 -50 src/sys/contrib/dev/acpica/acutils.h
1.6 +67 -37 src/sys/contrib/dev/acpica/dbcmds.c
1.5 +122 -66 src/sys/contrib/dev/acpica/dbxface.c
1.15 +3 -3 src/sys/contrib/dev/acpica/exfldio.c
1.7 +2 -2 src/sys/contrib/dev/acpica/exsystem.c
1.9 +57 -21 src/sys/contrib/dev/acpica/hwsleep.c
1.20 +18 -43 src/sys/contrib/dev/acpica/psparse.c
1.8 +16 -16 src/sys/contrib/dev/acpica/rscreate.c
1.11 +5 -5 src/sys/contrib/dev/acpica/tbget.c
1.9 +39 -30 src/sys/contrib/dev/acpica/utglobal.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304291911.h3TJB0E2076851>