Merge branch 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Mar 2015 00:29:16 +0000 (01:29 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Mar 2015 00:29:16 +0000 (01:29 +0100)
commit1e3e770cfb2b0f63a15bf8bcd31ad8eed2e76f0d
treec0f3195d186a9e9f4dcd1d4eb7fab0cdd1639ace
parent79d223646baa14272dc90044a0e798c552b72eda
parent28d634038d8fed8d25b92f21b728318a79c0be00
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