10 commits

Author	SHA1	Message	Date
Jung-uk Kim	676ba8b815	Resolve conflicts of unchanged files that are off the vendor branch.	2007-03-22 17:58:27 +00:00
Jung-uk Kim	b56f6e1fd7	Fix conflicts from import of Intel ACPI-CA 20051021	2005-11-01 22:28:49 +00:00
David E. O'Brien	3e50df5a3e	Fix conflicts of import of Intel ACPI-CA 20041119 with system includes fixups.	2005-10-24 04:35:20 +00:00
Nate Lawson	eccb3e0e14	Remove warnings from vendor files. This takes some files off the vendor ... branch but they have indicated they will not fix these warnings.	2004-04-14 18:12:29 +00:00
Nate Lawson	2a2a3f2735	Vendor import of ACPICA 20040220	2004-02-28 20:23:30 +00:00
Nate Lawson	4146e46ceb	ACPICA import from the 0619 dist.	2003-07-13 22:44:13 +00:00
Nate Lawson	17b7010ddc	Import of Intel ACPI 20030228 vendor distribution	2003-04-29 18:39:29 +00:00
Mitsuru IWASAKI	716b1ee2b9	Vendor import of the Intel ACPI CA 20021118 drop. ... Approved by: re	2002-11-27 18:07:48 +00:00
Mitsuru IWASAKI	2d12e67c7d	Vendor import of the Intel ACPI CA 20020815 drop.	2002-08-29 01:51:24 +00:00
Mitsuru IWASAKI	da9df8d45e	Vendor import of the Intel ACPI CA 20020725 drop.	2002-07-30 19:33:39 +00:00