Module Name:	src
Committed By:	kanaoka
Date:		Mon Dec 23 00:22:17 UTC 2002

Modified Files:
	src/sys/dev/acpi/acpica: files.acpica
	src/sys/dev/acpi/acpica/Osd: OsdHardware.c OsdMisc.c OsdSynch.c
	src/sys/dev/acpi/acpica/Subsystem: acconfig.h acdebug.h acdispat.h
	    acenv.h acevents.h acexcep.h acgcc.h acglobal.h achware.h
	    acinterp.h aclocal.h acmacros.h acnamesp.h acnetbsd.h acobject.h
	    acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h acresrc.h
	    acstruct.h actables.h actbl.h actbl1.h actbl2.h actbl71.h actypes.h
	    acutils.h adisasm.h amlcode.h dbcmds.c dbdisply.c dbexec.c
	    dbfileio.c dbhistry.c dbinput.c dbstats.c dbutils.c dbxface.c
	    dsfield.c dsmethod.c dsmthdat.c dsobject.c dsopcode.c dsutils.c
	    dswexec.c dswload.c dswscope.c dswstate.c evevent.c evmisc.c
	    evregion.c evrgnini.c evsci.c evxface.c evxfevnt.c evxfregn.c
	    exconfig.c exconvrt.c excreate.c exdump.c exfield.c exfldio.c
	    exmisc.c exmutex.c exnames.c exoparg1.c exoparg2.c exoparg3.c
	    exoparg6.c exprep.c exregion.c exresnte.c exresolv.c exresop.c
	    exstore.c exstoren.c exstorob.c exsystem.c exutils.c hwacpi.c
	    hwgpe.c hwregs.c hwsleep.c hwtimer.c nsaccess.c nsalloc.c nsdump.c
	    nseval.c nsinit.c nsload.c nsnames.c nsobject.c nssearch.c
	    nsutils.c nswalk.c nsxfname.c nsxfobj.c psargs.c psfind.c
	    psopcode.c psparse.c psscope.c pstree.c psutils.c pswalk.c
	    psxface.c rsaddr.c rscalc.c rscreate.c rsdump.c rsio.c rsirq.c
	    rslist.c rsmemory.c rsmisc.c rsutils.c rsxface.c tbconvrt.c tbget.c
	    tbinstal.c tbutils.c tbxface.c tbxfroot.c utalloc.c utclib.c
	    utcopy.c utdebug.c utdelete.c uteval.c utglobal.c utinit.c utmath.c
	    utmisc.c utobject.c utxface.c

Log Message:
Resolve conflict from acpica-unix-20021205.


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/sys/dev/acpi/acpica/files.acpica
cvs rdiff -r1.3 -r1.4 src/sys/dev/acpi/acpica/Osd/OsdHardware.c \
    src/sys/dev/acpi/acpica/Osd/OsdSynch.c
cvs rdiff -r1.4 -r1.5 src/sys/dev/acpi/acpica/Osd/OsdMisc.c
cvs rdiff -r1.2 -r1.3 src/sys/dev/acpi/acpica/Subsystem/acconfig.h \
    src/sys/dev/acpi/acpica/Subsystem/acdebug.h \
    src/sys/dev/acpi/acpica/Subsystem/acdispat.h \
    src/sys/dev/acpi/acpica/Subsystem/acevents.h \
    src/sys/dev/acpi/acpica/Subsystem/acexcep.h \
    src/sys/dev/acpi/acpica/Subsystem/acglobal.h \
    src/sys/dev/acpi/acpica/Subsystem/achware.h \
    src/sys/dev/acpi/acpica/Subsystem/acinterp.h \
    src/sys/dev/acpi/acpica/Subsystem/aclocal.h \
    src/sys/dev/acpi/acpica/Subsystem/acnamesp.h \
    src/sys/dev/acpi/acpica/Subsystem/acobject.h \
    src/sys/dev/acpi/acpica/Subsystem/acoutput.h \
    src/sys/dev/acpi/acpica/Subsystem/acparser.h \
    src/sys/dev/acpi/acpica/Subsystem/acpixf.h \
    src/sys/dev/acpi/acpica/Subsystem/acresrc.h \
    src/sys/dev/acpi/acpica/Subsystem/acstruct.h \
    src/sys/dev/acpi/acpica/Subsystem/actables.h \
    src/sys/dev/acpi/acpica/Subsystem/actbl.h \
    src/sys/dev/acpi/acpica/Subsystem/actbl1.h \
    src/sys/dev/acpi/acpica/Subsystem/actbl2.h \
    src/sys/dev/acpi/acpica/Subsystem/actbl71.h \
    src/sys/dev/acpi/acpica/Subsystem/acutils.h \
    src/sys/dev/acpi/acpica/Subsystem/amlcode.h \
    src/sys/dev/acpi/acpica/Subsystem/exoparg1.c \
    src/sys/dev/acpi/acpica/Subsystem/exoparg2.c \
    src/sys/dev/acpi/acpica/Subsystem/exoparg6.c \
    src/sys/dev/acpi/acpica/Subsystem/utmath.c
cvs rdiff -r1.4 -r1.5 src/sys/dev/acpi/acpica/Subsystem/acenv.h \
    src/sys/dev/acpi/acpica/Subsystem/acnetbsd.h \
    src/sys/dev/acpi/acpica/Subsystem/actypes.h \
    src/sys/dev/acpi/acpica/Subsystem/dbfileio.c \
    src/sys/dev/acpi/acpica/Subsystem/hwregs.c \
    src/sys/dev/acpi/acpica/Subsystem/rsirq.c
cvs rdiff -r1.3 -r1.4 src/sys/dev/acpi/acpica/Subsystem/acgcc.h \
    src/sys/dev/acpi/acpica/Subsystem/acmacros.h \
    src/sys/dev/acpi/acpica/Subsystem/acpi.h \
    src/sys/dev/acpi/acpica/Subsystem/acpiosxf.h \
    src/sys/dev/acpi/acpica/Subsystem/dbhistry.c \
    src/sys/dev/acpi/acpica/Subsystem/dbutils.c \
    src/sys/dev/acpi/acpica/Subsystem/dbxface.c \
    src/sys/dev/acpi/acpica/Subsystem/dsfield.c \
    src/sys/dev/acpi/acpica/Subsystem/dsmethod.c \
    src/sys/dev/acpi/acpica/Subsystem/dsmthdat.c \
    src/sys/dev/acpi/acpica/Subsystem/dsobject.c \
    src/sys/dev/acpi/acpica/Subsystem/dsopcode.c \
    src/sys/dev/acpi/acpica/Subsystem/dsutils.c \
    src/sys/dev/acpi/acpica/Subsystem/dswexec.c \
    src/sys/dev/acpi/acpica/Subsystem/dswload.c \
    src/sys/dev/acpi/acpica/Subsystem/dswscope.c \
    src/sys/dev/acpi/acpica/Subsystem/dswstate.c \
    src/sys/dev/acpi/acpica/Subsystem/evevent.c \
    src/sys/dev/acpi/acpica/Subsystem/evmisc.c \
    src/sys/dev/acpi/acpica/Subsystem/evregion.c \
    src/sys/dev/acpi/acpica/Subsystem/evrgnini.c \
    src/sys/dev/acpi/acpica/Subsystem/evsci.c \
    src/sys/dev/acpi/acpica/Subsystem/evxface.c \
    src/sys/dev/acpi/acpica/Subsystem/evxfevnt.c \
    src/sys/dev/acpi/acpica/Subsystem/evxfregn.c \
    src/sys/dev/acpi/acpica/Subsystem/exconfig.c \
    src/sys/dev/acpi/acpica/Subsystem/excreate.c \
    src/sys/dev/acpi/acpica/Subsystem/exdump.c \
    src/sys/dev/acpi/acpica/Subsystem/exfield.c \
    src/sys/dev/acpi/acpica/Subsystem/exfldio.c \
    src/sys/dev/acpi/acpica/Subsystem/exmisc.c \
    src/sys/dev/acpi/acpica/Subsystem/exnames.c \
    src/sys/dev/acpi/acpica/Subsystem/exoparg3.c \
    src/sys/dev/acpi/acpica/Subsystem/exprep.c \
    src/sys/dev/acpi/acpica/Subsystem/exregion.c \
    src/sys/dev/acpi/acpica/Subsystem/exresnte.c \
    src/sys/dev/acpi/acpica/Subsystem/exresolv.c \
    src/sys/dev/acpi/acpica/Subsystem/exstore.c \
    src/sys/dev/acpi/acpica/Subsystem/exstoren.c \
    src/sys/dev/acpi/acpica/Subsystem/exstorob.c \
    src/sys/dev/acpi/acpica/Subsystem/exsystem.c \
    src/sys/dev/acpi/acpica/Subsystem/exutils.c \
    src/sys/dev/acpi/acpica/Subsystem/hwacpi.c \
    src/sys/dev/acpi/acpica/Subsystem/hwgpe.c \
    src/sys/dev/acpi/acpica/Subsystem/hwsleep.c \
    src/sys/dev/acpi/acpica/Subsystem/hwtimer.c \
    src/sys/dev/acpi/acpica/Subsystem/nsaccess.c \
    src/sys/dev/acpi/acpica/Subsystem/nsalloc.c \
    src/sys/dev/acpi/acpica/Subsystem/nseval.c \
    src/sys/dev/acpi/acpica/Subsystem/nsinit.c \
    src/sys/dev/acpi/acpica/Subsystem/nsload.c \
    src/sys/dev/acpi/acpica/Subsystem/nsnames.c \
    src/sys/dev/acpi/acpica/Subsystem/nsobject.c \
    src/sys/dev/acpi/acpica/Subsystem/nssearch.c \
    src/sys/dev/acpi/acpica/Subsystem/nsutils.c \
    src/sys/dev/acpi/acpica/Subsystem/nswalk.c \
    src/sys/dev/acpi/acpica/Subsystem/nsxfname.c \
    src/sys/dev/acpi/acpica/Subsystem/nsxfobj.c \
    src/sys/dev/acpi/acpica/Subsystem/psargs.c \
    src/sys/dev/acpi/acpica/Subsystem/psfind.c \
    src/sys/dev/acpi/acpica/Subsystem/psopcode.c \
    src/sys/dev/acpi/acpica/Subsystem/psparse.c \
    src/sys/dev/acpi/acpica/Subsystem/psscope.c \
    src/sys/dev/acpi/acpica/Subsystem/pstree.c \
    src/sys/dev/acpi/acpica/Subsystem/psutils.c \
    src/sys/dev/acpi/acpica/Subsystem/pswalk.c \
    src/sys/dev/acpi/acpica/Subsystem/psxface.c \
    src/sys/dev/acpi/acpica/Subsystem/rsaddr.c \
    src/sys/dev/acpi/acpica/Subsystem/rscalc.c \
    src/sys/dev/acpi/acpica/Subsystem/rscreate.c \
    src/sys/dev/acpi/acpica/Subsystem/rsio.c \
    src/sys/dev/acpi/acpica/Subsystem/rslist.c \
    src/sys/dev/acpi/acpica/Subsystem/rsmemory.c \
    src/sys/dev/acpi/acpica/Subsystem/rsmisc.c \
    src/sys/dev/acpi/acpica/Subsystem/rsutils.c \
    src/sys/dev/acpi/acpica/Subsystem/rsxface.c \
    src/sys/dev/acpi/acpica/Subsystem/tbconvrt.c \
    src/sys/dev/acpi/acpica/Subsystem/tbget.c \
    src/sys/dev/acpi/acpica/Subsystem/tbinstal.c \
    src/sys/dev/acpi/acpica/Subsystem/tbutils.c \
    src/sys/dev/acpi/acpica/Subsystem/tbxface.c \
    src/sys/dev/acpi/acpica/Subsystem/tbxfroot.c \
    src/sys/dev/acpi/acpica/Subsystem/utalloc.c \
    src/sys/dev/acpi/acpica/Subsystem/utclib.c \
    src/sys/dev/acpi/acpica/Subsystem/utdebug.c \
    src/sys/dev/acpi/acpica/Subsystem/utdelete.c \
    src/sys/dev/acpi/acpica/Subsystem/uteval.c \
    src/sys/dev/acpi/acpica/Subsystem/utglobal.c \
    src/sys/dev/acpi/acpica/Subsystem/utinit.c \
    src/sys/dev/acpi/acpica/Subsystem/utmisc.c \
    src/sys/dev/acpi/acpica/Subsystem/utxface.c
cvs rdiff -r1.1 -r1.2 src/sys/dev/acpi/acpica/Subsystem/adisasm.h
cvs rdiff -r1.5 -r1.6 src/sys/dev/acpi/acpica/Subsystem/dbcmds.c \
    src/sys/dev/acpi/acpica/Subsystem/dbdisply.c \
    src/sys/dev/acpi/acpica/Subsystem/dbexec.c \
    src/sys/dev/acpi/acpica/Subsystem/dbinput.c \
    src/sys/dev/acpi/acpica/Subsystem/exconvrt.c \
    src/sys/dev/acpi/acpica/Subsystem/exmutex.c \
    src/sys/dev/acpi/acpica/Subsystem/exresop.c \
    src/sys/dev/acpi/acpica/Subsystem/nsdump.c \
    src/sys/dev/acpi/acpica/Subsystem/rsdump.c \
    src/sys/dev/acpi/acpica/Subsystem/utcopy.c \
    src/sys/dev/acpi/acpica/Subsystem/utobject.c
cvs rdiff -r1.6 -r1.7 src/sys/dev/acpi/acpica/Subsystem/dbstats.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.