From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 3 Oct 2014 13:46:02 +0000 (+0200)
Subject: Merge back 'acpi-video' material for v3.18.
X-Git-Tag: v3.18-rc1~109^2~12^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cbe68a2bd092ff67575323f30a170d55df31f55f;p=users%2Fjedix%2Flinux-maple.git

Merge back 'acpi-video' material for v3.18.
---

cbe68a2bd092ff67575323f30a170d55df31f55f