]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'turbostat-format' into tools-test
authorLen Brown <len.brown@intel.com>
Sun, 31 Jul 2011 22:33:57 +0000 (18:33 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 31 Jul 2011 22:33:57 +0000 (18:33 -0400)

Trivial merge