Merge branch 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 20 Jan 2016 23:43:29 +0000 (00:43 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 20 Jan 2016 23:43:29 +0000 (00:43 +0100)
commitdb2b52f75250c88ee3c6ba3d91bef38f3f1a1e8c
tree22ab374206184fa6c0c6096c7a835e774023ef5c
parentf11aef69b235bc30c323776d75ac23b43aac45bb
parent38cb76a307821f76c7f9dff7449f73aeb014d5cc
Merge branch 'pm-tools'

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