projects / kernel / kernel-generic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4cc75c 86239ce)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 May 2013 22:23:17 +0000 (15:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 May 2013 22:23:17 +0000 (15:23 -0700)
Pull idle update from Len Brown:
 "Add support for new Haswell-ULT CPU idle power states"

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  intel_idle: initial C8, C9, C10 support
  tools/power turbostat: display C8, C9, C10 residency

1  2 
arch/x86/include/uapi/asm/msr-index.h patch | diff1 | diff2 | blob | history
drivers/idle/intel_idle.c patch | diff1 | diff2 | blob | history
include/linux/cpuidle.h patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/uapi/asm/msr-index.h
Simple merge
diff --cc drivers/idle/intel_idle.c
Simple merge
diff --cc include/linux/cpuidle.h
Simple merge
Domain: System / Uncategorized;