diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-20 04:49:21 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-20 04:49:21 +0200 |
commit | ce43f4fd6f103681c7485c2b1967179647e73555 (patch) | |
tree | e4bd94b72097278e902ae0f500267a985004cec8 /include | |
parent | doc: Fix various RCU docbook comment-header problems (diff) | |
parent | Revert "tools/power turbostat: stop migrating, unless '-m'" (diff) | |
download | linux-ce43f4fd6f103681c7485c2b1967179647e73555.tar.xz linux-ce43f4fd6f103681c7485c2b1967179647e73555.zip |
Merge tag 'pm-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"This reverts a problematic commit modifying the turbostat utility that
went in during the 4.13 cycle (Len Brown)"
* tag 'pm-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "tools/power turbostat: stop migrating, unless '-m'"
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions