Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Aug 2014 15:25:34 +0000 (09:25 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Aug 2014 15:25:34 +0000 (09:25 -0600)
commit49899007b9401486421c99bb269db89b88136e47
treece73158ca09d04749dc2685eacf86b45554bd666
parent6fedb0ff32e6bfcc408a8d52c68b8bfe4e3d945b
parente7c95ff32d0075736cbdd8d38d954fb4ed6ced9b
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux

Pull idle update from Len Brown:
 "Two Intel-platform-specific updates to intel_idle, and a cosmetic
  tweak to the turbostat utility"

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: tweak whitespace in output format
  intel_idle: Broadwell support
  intel_idle: Disable Baytrail Core and Module C6 auto-demotion
arch/x86/include/uapi/asm/msr-index.h