Merge branch 'acpi-lpss' into acpi-enumeration
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 May 2014 13:55:19 +0000 (15:55 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 May 2014 13:55:19 +0000 (15:55 +0200)
commit52d1d0b12beaf98b6d144d7d1b24eb96cfea60f6
tree4dde4eeb3f6ce7a4d3b68f4ab9adfc60da519a6e
parentc7208164e66f63e3ec1759b98087849286410741
parent3022f4de491c096650d55ae9d562a9c811830724
Merge branch 'acpi-lpss' into acpi-enumeration
drivers/acpi/acpi_platform.c