]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'acpi-config' into acpica
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 18 Mar 2014 00:53:28 +0000 (01:53 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 18 Mar 2014 00:53:28 +0000 (01:53 +0100)
commite5fb81e0ab538cc9bc9e6536bafe4ea903d5ac28
tree751337a429d58b60e03e22d2a30fccd87e1bc02a
parent3dde92e7bca9630d16e259a4977d67d96060ef68
parent3556cba5d52c07dc245b36dc8c4eb9cbfb3f1ec1
Merge branch 'acpi-config' into acpica

Conflicts:
include/acpi/platform/aclinux.h
include/acpi/platform/aclinux.h