summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/acpi_power_meter.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-09-13 21:24:20 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-13 21:24:20 +0200
commit46c1e79fee417f151547aa46fae04ab06cb666f4 (patch)
tree560f0024d88788656cc48cba8afd4b0b8406d607 /drivers/hwmon/acpi_power_meter.c
parentMerge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentMerge tag 'perf-urgent-for-mingo-4.14-20170912' of git://git.kernel.org/pub/s... (diff)
downloadlinux-46c1e79fee417f151547aa46fae04ab06cb666f4.tar.xz
linux-46c1e79fee417f151547aa46fae04ab06cb666f4.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "A handful of tooling fixes" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf stat: Wait for the correct child perf tools: Support running perf binaries with a dash in their name perf config: Check not only section->from_system_config but also item's perf ui progress: Fix progress update perf ui progress: Make sure we always define step value perf tools: Open perf.data with O_CLOEXEC flag tools lib api: Fix make DEBUG=1 build perf tests: Fix compile when libunwind's unwind.h is available tools include linux: Guard against redefinition of some macros
Diffstat (limited to 'drivers/hwmon/acpi_power_meter.c')
0 files changed, 0 insertions, 0 deletions