diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 23:08:54 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 23:08:54 +0100 |
| commit | a2ff34c433932e201ea3c5081335f3beeb2509bd (patch) | |
| tree | 4caa54d641e33a30fb5a540c151202a83678c999 /drivers | |
| parent | Merge branch 'pm-cpufreq' (diff) | |
| parent | ACPI / battery: Fix incorrect sscanf() string in acpi_battery_init_alarm() (diff) | |
| parent | ACPI / video: Add HP EliteBook Revolve 810 to the blacklist (diff) | |
| download | linux-dev-a2ff34c433932e201ea3c5081335f3beeb2509bd.tar.xz linux-dev-a2ff34c433932e201ea3c5081335f3beeb2509bd.zip | |
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