From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 20 Jan 2016 23:43:29 +0000 (+0100)
Subject: Merge branch 'pm-tools'
X-Git-Tag: v4.5-rc1~37^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=db2b52f75250c88ee3c6ba3d91bef38f3f1a1e8c;p=linux-block.git

Merge branch 'pm-tools'

* pm-tools:
  cpupower: Fix build error in cpufreq-info
---

db2b52f75250c88ee3c6ba3d91bef38f3f1a1e8c