projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43e31e4
41139ac
)
Merge branch 'acpi-apei'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Thu, 2 Mar 2017 23:45:22 +0000
(
00:45
+0100)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Thu, 2 Mar 2017 23:45:22 +0000
(
00:45
+0100)
* acpi-apei:
ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
Trivial merge