diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 17:08:54 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 17:08:54 -0500 |
| commit | a2ff34c433932e201ea3c5081335f3beeb2509bd (patch) | |
| tree | 4caa54d641e33a30fb5a540c151202a83678c999 /drivers/acpi | |
| parent | 7fd905064a87f197ac4be7878b0bf885591c9d55 (diff) | |
| parent | 47a08c85f70ebdbaaf42b444af57dd6f83e04485 (diff) | |
| parent | e18ac62fa4b3f16234bab0d5a6627c57dbae9e7e (diff) | |
Merge branches 'acpi-cleanup' and 'acpi-video'
* acpi-cleanup:
ACPI / battery: Fix incorrect sscanf() string in acpi_battery_init_alarm()
ACPI / proc: remove unneeded NULL check
ACPI / utils: remove a pointless NULL check
* acpi-video:
ACPI / video: Add HP EliteBook Revolve 810 to the blacklist