Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 23:12:43 +0000 (16:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 23:12:43 +0000 (16:12 -0700)
commitebe80544338a393e94b65995120c3028c80abc62
tree401a4ee423feba3da5fc6cabaadd815a0ab9aace
parent1ce6ec91a8528f80442eee7157be1b016248a883
parent149c2319c6316d979de90ce2c8665e9c02d5927b
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux

Pull idle patches from Len Brown:
 "A pair of small patches for 3.9-rc7.

  This CPU-id should have been included in the ones that we updated
  earlier in 3.9.  This pair of patches will allow this flavor of
  Haswell to behave like the other flavors."

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: additional Haswell CPU-id
  intel_idle: additional Haswell CPU-id