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)
commit5c0b1b2003362c9015ee3324816c0966efaa0f88
tree86beaa1096b91bd102752c4df5be78942857200e
parentd5ba5b141dae17155d12b897f2eedeaf6800db7c
parent10619066a353f27fe3700a448fa2b21643687840
Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI: implement acpi_os_get_timer() according the spec
drivers/acpi/osl.c