From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 5 May 2014 23:42:04 +0000 (+0200)
Subject: Merge branch 'powercap' into linux-next
X-Git-Tag: next-20140506~64^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f6f978352f1a5d9065cf42ca00d6a75a22dd818;p=karo-tx-linux.git

Merge branch 'powercap' into linux-next

* powercap:
  powercap / RAPL: add new CPU IDs
  powercap / RAPL: further relax energy counter checks
---

8f6f978352f1a5d9065cf42ca00d6a75a22dd818