From: Rafael J. Wysocki Date: Tue, 8 Apr 2014 11:27:40 +0000 (+0200) Subject: Merge branch 'pm-cpuidle' X-Git-Tag: v3.15-rc1~28^2~4 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6 Merge branch 'pm-cpuidle' * pm-cpuidle: cpuidle: sysfs: Export target residency information intel_idle: fine-tune IVT residency targets tools/power turbostat: Run on Broadwell tools/power turbostat: simplify output, add Avg_MHz intel_idle: Add CPU model 54 (Atom N2000 series) intel_idle: support Bay Trail intel_idle: allow sparse sub-state numbering, for Bay Trail ACPI idle: permit sparse C-state sub-state numbers --- 8c73c4d8319f38ec1a1fc630a88cbcb79cb1a8f6