summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi_bus.h
diff options
context:
space:
mode:
authorRafael J. Wysocki2014-03-20 13:25:16 +0100
committerRafael J. Wysocki2014-03-20 13:25:16 +0100
commitcb97def86446201d9135090615d8c08f9669d338 (patch)
treeefa6e63440dfde29724d02150b871432a7496c05 /include/acpi/acpi_bus.h
parentMerge branch 'acpica' (diff)
parentMAINTAINERS: Reorder maintainer addresses for PM and ACPI (diff)
parentpowercap / intel_rapl: spell out SoC names (diff)
downloadkernel-qcow2-linux-cb97def86446201d9135090615d8c08f9669d338.tar.gz
kernel-qcow2-linux-cb97def86446201d9135090615d8c08f9669d338.tar.xz
kernel-qcow2-linux-cb97def86446201d9135090615d8c08f9669d338.zip
Merge branches 'misc' and 'powercap'
* misc: MAINTAINERS: Reorder maintainer addresses for PM and ACPI * powercap: powercap / intel_rapl: spell out SoC names powercap / intel_rapl: relax sanity check on energy counters