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)
* 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

1  2 
drivers/acpi/ec.c
drivers/acpi/thermal.c

Simple merge
Simple merge