| #
ec12a2fa |
| 27-Aug-2022 |
christos <christos@NetBSD.org> |
merge conflicts between acpica-20211217 and acpica-20220331
|
| #
adee7055 |
| 03-Apr-2021 |
christos <christos@NetBSD.org> |
Merge local changes with acpica-20210331
|
| #
bd973ebc |
| 28-Mar-2020 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
bd6fb9dd |
| 15-Oct-2019 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
f5a85da7 |
| 29-Apr-2019 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
116aa910 |
| 07-Apr-2018 |
christos <christos@NetBSD.org> |
Merge conflicts; STA methods and fields are not present anymore.
|
| #
35a687ff |
| 15-Sep-2017 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
d592fd16 |
| 25-Jan-2017 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
dc79220a |
| 04-May-2016 |
christos <christos@NetBSD.org> |
merge new acpica
|
| #
94e0d463 |
| 09-Jan-2016 |
christos <christos@NetBSD.org> |
merge new acpica
|
| #
e34402d4 |
| 18-Aug-2015 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
681d005e |
| 13-Apr-2015 |
christos <christos@NetBSD.org> |
resolve conflicts.
|
| #
ea4d7e80 |
| 25-Oct-2014 |
christos <christos@NetBSD.org> |
merge conflicts
|
| #
33841f6d |
| 27-Dec-2013 |
christos <christos@NetBSD.org> |
resolve conflicts
|
| #
7af23240 |
| 17-Feb-2011 |
jruoho <jruoho@NetBSD.org> |
Merge ACPICA 20110211.
|
| #
5fa0b4b7 |
| 17-Feb-2011 |
jruoho <jruoho@NetBSD.org> |
Apply our local patches.
|
| #
149703c7 |
| 17-Feb-2011 |
jruoho <jruoho@NetBSD.org> |
Reimport ACPICA 20100528 to a new location.
|