From 55303e9ac4cd5903cc13c55f79f35df11d4e693e Mon Sep 17 00:00:00 2001
From: msmith <msmith@FreeBSD.org>
Date: Wed, 31 Jan 2001 09:44:45 +0000
Subject: Merge conflicts from the ACPI CA 20010125 import.

---
 sys/contrib/dev/acpica/acgcc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sys/contrib/dev/acpica/acgcc.h')

diff --git a/sys/contrib/dev/acpica/acgcc.h b/sys/contrib/dev/acpica/acgcc.h
index aa57a34..f4510e7 100644
--- a/sys/contrib/dev/acpica/acgcc.h
+++ b/sys/contrib/dev/acpica/acgcc.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acgcc.h - GCC specific defines, etc.
- *       $Revision: 3 $
+ *       $Revision: 4 $
  *
  *****************************************************************************/
 
@@ -9,7 +9,7 @@
  *
  * 1. Copyright Notice
  *
- * Some or all of this work - Copyright (c) 1999, 2000, Intel Corp.
+ * Some or all of this work - Copyright (c) 1999, 2000, 2001, Intel Corp.
  * All rights reserved.
  *
  * 2. License
-- 
cgit v1.1