From owner-cvs-all Fri Oct 4 13: 9:21 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE8BF37B401; Fri, 4 Oct 2002 13:09:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BCBB43E42; Fri, 4 Oct 2002 13:09:20 -0700 (PDT) (envelope-from iwasaki@FreeBSD.org) Received: from freefall.freebsd.org (iwasaki@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g94K9KCo032410; Fri, 4 Oct 2002 13:09:20 -0700 (PDT) (envelope-from iwasaki@freefall.freebsd.org) Received: (from iwasaki@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g94K9KD0032409; Fri, 4 Oct 2002 13:09:20 -0700 (PDT) Message-Id: <200210042009.g94K9KD0032409@freefall.freebsd.org> From: Mitsuru IWASAKI Date: Fri, 4 Oct 2002 13:09:20 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/contrib/dev/acpica acconfig.h acutils.h dbcmds.c dbxface.c tbget.c utglobal.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG iwasaki 2002/10/04 13:09:20 PDT Modified files: sys/contrib/dev/acpica acconfig.h acutils.h dbcmds.c dbxface.c tbget.c utglobal.c Log: Resolve conflicts arising from the ACPI CA 20021002 import. Revision Changes Path 1.22 +2 -2 src/sys/contrib/dev/acpica/acconfig.h 1.5 +8 -8 src/sys/contrib/dev/acpica/acutils.h 1.4 +15 -7 src/sys/contrib/dev/acpica/dbcmds.c 1.4 +7 -2 src/sys/contrib/dev/acpica/dbxface.c 1.9 +9 -5 src/sys/contrib/dev/acpica/tbget.c 1.7 +9 -12 src/sys/contrib/dev/acpica/utglobal.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message