cvs commit: src/sys/contrib/dev/acpica acconfig.h acenv.h
acfreebsd.h acgcc.h acpi.h acpiosxf.h acpixf.h acutils.h
aecommon.h dbfileio.c dmopcode.c exfldio.c exsystem.c hwregs.c
osunixxf.c psparse.c rscreate.c rsdump.c utdebug.c uteval.c ...
Jung-uk Kim
jkim at FreeBSD.org
Thu Mar 22 17:58:29 UTC 2007
jkim 2007-03-22 17:58:28 UTC
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
aecommon.h dbfileio.c dmopcode.c
exfldio.c exsystem.c hwregs.c
osunixxf.c psparse.c rscreate.c
rsdump.c utdebug.c uteval.c utglobal.c
Log:
Resolve conflicts of unchanged files that are off the vendor branch.
Revision Changes Path
1.34 +34 -26 src/sys/contrib/dev/acpica/acconfig.h
1.13 +29 -29 src/sys/contrib/dev/acpica/acenv.h
1.32 +31 -2 src/sys/contrib/dev/acpica/acfreebsd.h
1.22 +8 -5 src/sys/contrib/dev/acpica/acgcc.h
1.9 +2 -2 src/sys/contrib/dev/acpica/acpi.h
1.19 +80 -40 src/sys/contrib/dev/acpica/acpiosxf.h
1.25 +32 -29 src/sys/contrib/dev/acpica/acpixf.h
1.15 +155 -48 src/sys/contrib/dev/acpica/acutils.h
1.3 +10 -3 src/sys/contrib/dev/acpica/aecommon.h
1.14 +113 -59 src/sys/contrib/dev/acpica/dbfileio.c
1.5 +61 -38 src/sys/contrib/dev/acpica/dmopcode.c
1.26 +126 -70 src/sys/contrib/dev/acpica/exfldio.c
1.14 +71 -116 src/sys/contrib/dev/acpica/exsystem.c
1.7 +182 -172 src/sys/contrib/dev/acpica/hwregs.c
1.3 +74 -31 src/sys/contrib/dev/acpica/osunixxf.c
1.28 +42 -30 src/sys/contrib/dev/acpica/psparse.c
1.13 +68 -61 src/sys/contrib/dev/acpica/rscreate.c
1.3 +52 -50 src/sys/contrib/dev/acpica/rsdump.c
1.3 +56 -17 src/sys/contrib/dev/acpica/utdebug.c
1.7 +109 -48 src/sys/contrib/dev/acpica/uteval.c
1.20 +75 -180 src/sys/contrib/dev/acpica/utglobal.c
More information about the cvs-src
mailing list