Merge back earlier 'acpi-video' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 24 May 2014 11:27:11 +0000 (13:27 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 24 May 2014 11:27:11 +0000 (13:27 +0200)

Trivial merge