summaryrefslogtreecommitdiff
path: root/arch
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 /arch
parent99e4d89afc75d7bec31420c5aa2fba53e0411f95 (diff)
parent3a75ef0c788f092d912b2944e323e6447d557437 (diff)
parent8b691c9cf297bc32a021b7fef0dd0e32f130e542 (diff)
parentefd756daf4ddae3cec2404c4e0b680b7cfdd6a45 (diff)
parent2fad93083e288a7d24bf7284c87f0d80a5a2c599 (diff)
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()