git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 43e31e4 41139ac)
Merge branch 'acpi-apei'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 2 Mar 2017 23:45:22 +0000 (00:45 +0100)
committerRafael 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
Unnamed repository; edit this file 'description' to name the repository.