summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/annotate.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-08 11:27:19 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-08 11:27:19 +0100
commitd4abd46b7e7279a61a1aa76d1d1b16a990178e75 (patch)
tree948912ab1b175f1d43037495f6b353e685a852d7 /tools/perf/util/annotate.h
parent3c9c75de4ce7fbe128316afc6a960dfe3d590e03 (diff)
parent97e45dd6e82a556e64a81824bb87c2b9bf98ddd3 (diff)
parent4446823e2573e97b26f0534ff8db9e9c4cb65840 (diff)
parentb52f451105020677cad61a13b3b67af3fdedb91f (diff)
downloadlinux-d4abd46b7e7279a61a1aa76d1d1b16a990178e75.tar.bz2
Merge branches 'acpi-video', 'acpi-battery' and 'acpi-cppc'
* acpi-video: ACPI / video: Use true for boolean value * acpi-battery: ACPI / battery: Add quirk for Asus UX360UA and UX410UAK * acpi-cppc: ACPI / CPPC: Use 64-bit arithmetic instead of 32-bit