Merge branch 'acpica' into acpi-gpe
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 23 Jul 2014 21:13:09 +0000 (23:13 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 23 Jul 2014 21:13:09 +0000 (23:13 +0200)

Trivial merge