src-test2/sys/contrib/dev/acpica/acpixf.h, branch release/7.3.0_cvs FreeBSD source tree https://cgit-dev.freebsd.org/src-test2/atom?h=release%2F7.3.0_cvs 2007-03-22T17:58:27Z Resolve conflicts of unchanged files that are off the vendor branch. 2007-03-22T17:58:27Z Jung-uk Kim jkim@FreeBSD.org 2007-03-22T17:58:27Z urn:sha1:676ba8b815ca90527d34c093f848e88956d8d297 Unchanged files that are off the vendor branch 2005-11-01T22:23:25Z Jung-uk Kim jkim@FreeBSD.org 2005-11-01T22:23:25Z urn:sha1:775a51a92fd081a7eeaa5dad401cea0251acf7dc Fix conflicts of import of Intel ACPI-CA 20041119 with system includes fixups. 2005-10-24T04:35:20Z David E. O'Brien obrien@FreeBSD.org 2005-10-24T04:35:20Z urn:sha1:3e50df5a3e731ca77f20b1c4ab85dd879dfe54e4 Unchanged files that are off the vendor branch. 2004-12-01T23:34:39Z Mark Santcroos marks@FreeBSD.org 2004-12-01T23:34:39Z urn:sha1:8baa584183e686f6b9c4c56ff3d5f934e4f71eab Approved by: njl MFC after: 1 week Unchanged files that are off the vendor branch. 2004-05-25T02:39:01Z Nate Lawson njl@FreeBSD.org 2004-05-25T02:39:01Z urn:sha1:6c57d4e8fb9e5e0835bd3e35ac810a145a702d5c Unchanged files from ACPICA 20040220 that are off the vendor branch. 2004-02-28T20:35:57Z Nate Lawson njl@FreeBSD.org 2004-02-28T20:35:57Z urn:sha1:96f2784ee595dd45d442d0d50cfea52550528061 Unmodified files from the vendor 0619 dist that should no longer be off the 2003-07-13T22:45:34Z Nate Lawson njl@FreeBSD.org 2003-07-13T22:45:34Z urn:sha1:4f42014b1c9383dbb2fd36bb41b7922c7cfeb608 vendor branch. Resolve conflicts. 2003-04-29T19:11:00Z Nate Lawson njl@FreeBSD.org 2003-04-29T19:11:00Z urn:sha1:adfda8d3b37e3f8f39479d08b171878433d15dc6 Resolve conflicts arising from the ACPI CA 20021118 import. 2002-11-27T18:09:20Z Mitsuru IWASAKI iwasaki@FreeBSD.org 2002-11-27T18:09:20Z urn:sha1:21b5fd3cfd5d4096824b2d348008acf3a7effd1c Resolve conflicts arising from the ACPI CA 20020725 import. 2002-07-30T19:35:32Z Mitsuru IWASAKI iwasaki@FreeBSD.org 2002-07-30T19:35:32Z urn:sha1:b69ed3f4c6ae870326512ac94458b4b26a940208