Merge branch 'acpi-assorted'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 29 Jun 2013 13:03:44 +0000 (15:03 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 29 Jun 2013 13:03:44 +0000 (15:03 +0200)
* acpi-assorted:
  ACPI: implement acpi_os_get_timer() according the spec

1  2 
drivers/acpi/osl.c

Simple merge