| #
306536 |
|
30-Sep-2016 |
jkim |
MFC: r284583, r285797, r285799, r287168, r298714, r298720, r298838,
r300879
Merge ACPICA up to 20160527.
Requested by: mav
|
| #
284460 |
|
16-Jun-2015 |
jkim |
MFC: r283092, r283966
Merge ACPICA 20150515.
Relnotes: yes
|
| #
281687 |
|
18-Apr-2015 |
jkim |
MFC: r281396, r281475
Merge ACPICA 20150410.
Relnotes: yes
|
| #
281075 |
|
04-Apr-2015 |
dim |
MFC r272444 (by jkim):
Merge ACPICA 20140926.
MFC r278970 (by jkim):
Merge ACPICA 20141107 and 20150204.
Approved by: jkim
Relnotes: yes
|
| #
259073 |
|
07-Dec-2013 |
peter |
Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.
Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.
The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.
Approved by: re (gjb, implicit)
|
| #
284460 |
|
16-Jun-2015 |
jkim |
MFC: r283092, r283966
Merge ACPICA 20150515.
Relnotes: yes
|
| #
281687 |
|
18-Apr-2015 |
jkim |
MFC: r281396, r281475
Merge ACPICA 20150410.
Relnotes: yes
|
| #
281075 |
|
04-Apr-2015 |
dim |
MFC r272444 (by jkim):
Merge ACPICA 20140926.
MFC r278970 (by jkim):
Merge ACPICA 20141107 and 20150204.
Approved by: jkim
Relnotes: yes
|
| #
259073 |
|
07-Dec-2013 |
peter |
Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.
Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.
The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.
Approved by: re (gjb, implicit)
|