summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/processor_idle.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 16:04:12 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-10 16:04:12 +0100
commitca45c879c2b5acade334da8d1309619a5960de49 (patch)
tree773d6ed4c20ceee16a64b93242ecb2292472bab2 /drivers/acpi/processor_idle.c
parentMerge branches 'acpi-video' and 'acpi-soc' (diff)
parentMAINTAINERS / ACPI: add the necessary '/' according to entry rules (diff)
parentACPI / sleep: mark acpi_sleep_dmi_check() __init (diff)
parentACPI / PCC: Use pr_debug() for debug messages in pcc_init() (diff)
parentACPI / table: remove duplicate NULL check for the handler of acpi_table_parse() (diff)
downloadlinux-ca45c879c2b5acade334da8d1309619a5960de49.tar.xz
linux-ca45c879c2b5acade334da8d1309619a5960de49.zip
Merge branches 'acpi-doc', 'acpi-pm', 'acpi-pcc' and 'acpi-tables'
* acpi-doc: MAINTAINERS / ACPI: add the necessary '/' according to entry rules ACPI / Documentation: add a missing '=' * acpi-pm: ACPI / sleep: mark acpi_sleep_dmi_check() __init * acpi-pcc: ACPI / PCC: Use pr_debug() for debug messages in pcc_init() * acpi-tables: ACPI / table: remove duplicate NULL check for the handler of acpi_table_parse()