Merge branch 'cpufreq-macros' into pm-cpufreq
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 30 Apr 2014 22:50:47 +0000 (00:50 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 30 Apr 2014 22:50:47 +0000 (00:50 +0200)

Trivial merge