]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
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)
* acpi-video:
  ACPI / video: Propagate the error code for acpi_video_register
  ACPI / video: Load the module even if ACPI is disabled


Trivial merge