]> git.baikalelectronics.ru Git - kernel.git/commit
Merge back earlier ACPICA material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:11:38 +0000 (18:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:11:38 +0000 (18:11 +0200)
commit37646717b8f4714ad0761f1af2aaa5418144d42c
tree7820cae684404d2bd26814a327f0e2809724dd33
parentddf899af51b57732aeb49d49d09eff5feb219d20
parent0e7b081ec852f2c1202b5056d2fa2a899afc062b
Merge back earlier ACPICA material.

Conflicts:
drivers/acpi/acpica/acglobal.h
include/acpi/acpixf.h