From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 6 Mar 2015 00:29:16 +0000 (+0100)
Subject: Merge branch 'acpi-video'
X-Git-Tag: v4.0-rc3~15^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1e3e770cfb2b0f63a15bf8bcd31ad8eed2e76f0d;p=linux.git

Merge branch 'acpi-video'

* acpi-video:
  ACPI / video: Propagate the error code for acpi_video_register
  ACPI / video: Load the module even if ACPI is disabled
---

1e3e770cfb2b0f63a15bf8bcd31ad8eed2e76f0d