summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-10-19 22:49:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-10-19 22:49:21 -0400
commitce43f4fd6f103681c7485c2b1967179647e73555 (patch)
treee4bd94b72097278e902ae0f500267a985004cec8 /fs
parent27fdb35fe99011d86bcc54f62fe84712c53f4d05 (diff)
parentc97cc7dbce2fe6f46e137f4b040f915a0181ee85 (diff)
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 'fs')
0 files changed, 0 insertions, 0 deletions