From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Oct 2017 02:49:21 +0000 (-0400)
Subject: Merge tag 'pm-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: v4.14-rc6~23
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce43f4fd6f103681c7485c2b1967179647e73555;p=linux

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'"
---

ce43f4fd6f103681c7485c2b1967179647e73555