From: Len Brown <len.brown@intel.com>
Date: Fri, 4 Apr 2014 17:05:22 +0000 (-0400)
Subject: Merge branches 'turbostat' and 'intel_idle' into release
X-Git-Tag: v3.15-rc1~28^2~4^2^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=23a299cd93781a190cdca0d7d16034837b7dfd86;p=linux-2.6-block.git

Merge branches 'turbostat' and 'intel_idle' into release
---

23a299cd93781a190cdca0d7d16034837b7dfd86