diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 15:25:25 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-08 15:25:25 +0400 |
| commit | 73df623addeaa6154b325b429a6c06eb6ad36004 (patch) | |
| tree | 6cf7196c253f812029e2bf7455fda33f9befd8d5 /net/wimax/stack.c | |
| parent | 9bc0482feae8763447746c89fd971704c819b52e (diff) | |
| parent | 23a299cd93781a190cdca0d7d16034837b7dfd86 (diff) | |
| download | linux-73df623addeaa6154b325b429a6c06eb6ad36004.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux into pm-cpuidle
Pull intel_idle and turbostat material for v3.15-rc1 from Len Brown.
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
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
Diffstat (limited to 'net/wimax/stack.c')
0 files changed, 0 insertions, 0 deletions