]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24d0cd3 a97ac35)
Merge branch 'powercap' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 5 May 2014 23:42:04 +0000 (01:42 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 5 May 2014 23:42:04 +0000 (01:42 +0200)
* powercap:
  powercap / RAPL: add new CPU IDs
  powercap / RAPL: further relax energy counter checks


Trivial merge
Linux kernel for KaRo TX COM modules