From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 7 Nov 2013 18:23:20 +0000 (+0100)
Subject: Merge branch 'powercap'
X-Git-Tag: firefly_0821_release~176^2~4983^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a4aaf2e0dfcc05578e8c822fce975a7d5836dc7f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'powercap'

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

a4aaf2e0dfcc05578e8c822fce975a7d5836dc7f