From: Linus Torvalds Date: Wed, 17 Apr 2013 23:12:43 +0000 (-0700) Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux X-Git-Tag: v3.9-rc8~16 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ebe80544338a393e94b65995120c3028c80abc62;p=~emulex%2Finfiniband.git Merge branch 'release' of git://git.kernel.org/pub/scm/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 --- ebe80544338a393e94b65995120c3028c80abc62