Merge branch 'cpuidle' into release
authorLen Brown <len.brown@intel.com>
Sat, 26 Sep 2015 04:51:12 +0000 (00:51 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 26 Sep 2015 04:51:12 +0000 (00:51 -0400)

Trivial merge