]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'cpuidle' and 'turbostat' into release
authorLen Brown <len.brown@intel.com>
Wed, 1 Apr 2015 01:59:56 +0000 (21:59 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 1 Apr 2015 01:59:56 +0000 (21:59 -0400)

Trivial merge