Merge tag 'linux-cpupower-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 6 Jun 2018 06:41:01 +0000 (08:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 6 Jun 2018 06:41:01 +0000 (08:41 +0200)
commit5202e32db01c2249abff22060970e5a6aa4344b6
tree912636a99831a6514ffe29acfe99627ab7c4d4be
parent3c89adb0d11117f64d5b501730be7fb2bf53a479
parentf9652d5cae04eb5e85303c087f5842d320499c65
Merge tag 'linux-cpupower-4.18-rc1' of git://git./linux/kernel/git/shuah/linux

Pull cpupower updates for v4.18-rc1 from Shuah Khan:

"This cpupower update for 4.18-rc1 consists of two minor fixes."

* tag 'linux-cpupower-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower : Fix header name to read idle state name
  cpupower: fix spelling mistake: "logilename" -> "logfilename"