]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4e94245 a97ac35 4ec6a9c 64ce854)
Merge branches 'powercap', 'pm-runtime' and 'pm-opp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:31:50 +0000 (18:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 27 May 2014 16:31:50 +0000 (18:31 +0200)
commit3158d30e80757b4214c375049bfce1fa9009fc16
tree6c50a9134f9204e54f42d7c20dee520d6c12aad8tree | snapshot
parent4e94245d0d7414a4e28fcee22d8ebebe9a04947ecommit | diff
parenta97ac35b5d9e948ccfcbc04c69e9d2c94e788e94commit | diff
parent4ec6a9cc23cbadb4721eb3fe778389c4bbede893commit | diff
parent64ce854578de82e9e16280298562721ced971668commit | diff
Merge branches 'powercap', 'pm-runtime' and 'pm-opp'

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

* pm-runtime:
  PM / runtime: Update documentation to reflect the current code flow

* pm-opp:
  PM / OPP: discard duplicate OPPs
  PM / OPP: Make OPP invisible to users in Kconfig
  PM / OPP: fix incorrect OPP count handling in of_init_opp_table
Documentation/power/runtime_pm.txt diff1 | diff2 | diff3 | diff4 | blob | history
Linux kernel for KaRo TX COM modules