Merge back 'acpi-video' material for v3.18.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 3 Oct 2014 13:46:02 +0000 (15:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 3 Oct 2014 13:46:02 +0000 (15:46 +0200)
1  2 
drivers/acpi/video.c

Simple merge