diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-19 22:49:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-19 22:49:21 -0400 |
| commit | ce43f4fd6f103681c7485c2b1967179647e73555 (patch) | |
| tree | e4bd94b72097278e902ae0f500267a985004cec8 /security/keys/encrypted-keys/encrypted.c | |
| parent | 27fdb35fe99011d86bcc54f62fe84712c53f4d05 (diff) | |
| parent | c97cc7dbce2fe6f46e137f4b040f915a0181ee85 (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 'security/keys/encrypted-keys/encrypted.c')
0 files changed, 0 insertions, 0 deletions