Merge branch 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Nov 2013 18:23:20 +0000 (19:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 7 Nov 2013 18:23:20 +0000 (19:23 +0100)
commita4aaf2e0dfcc05578e8c822fce975a7d5836dc7f
tree5185561547458f97069cad703a6b74fcec7bbf0d
parentcf8a1af855cfce135c31b84d29a7cb870638cdaa
parent08ff4cbe10da402e7c493ac72e298975f62a9e78
Merge branch 'powercap'

* powercap:
  PowerCap: Fix build error with option -Werror=format-security