projects
/
users
/
dwmw2
/
linux.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
79d2236
28d6340
)
Merge branch 'acpi-video'
author
Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 6 Mar 2015 00:29:16 +0000
(
01:29
+0100)
committer
Rafael 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