Merge branch 'acpi-assorted'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Aug 2013 12:13:50 +0000 (14:13 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Aug 2013 12:13:50 +0000 (14:13 +0200)
commitda48afb26b40ebb5d6b0e84793e0662859c7ea20
tree1c85a4ebd412a8c5e05e6dcb6a64f1326f8f1dff
parent7a330a5416de9240c93a6987e11cb32b581d3263
parent524f42fab787a9510be826ce3d736b56d454ac6d
Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT
  ACPI / thermal: Add check of "_TZD" availability and evaluating result
drivers/acpi/ec.c
drivers/acpi/thermal.c