]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d5fb51 fa743d9 89e7b25)
Merge branches 'pm-avs' and 'powercap' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 Oct 2015 22:00:38 +0000 (23:00 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 Oct 2015 22:00:38 +0000 (23:00 +0100)
* pm-avs:
  PM / AVS: rockchip-io: Fix module autoload for OF platform driver

* powercap:
  powercap / RAPL: Enable Broxton RAPL support


Trivial merge
Linux kernel for KaRo TX COM modules