From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 00:02:54 +0000 (-0700)
Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~18904
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=35b004cce1b0880876faecb8e0bd7cb2cb5a59d1;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'x86-cpu-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, intel, power: Correct the MSR_IA32_ENERGY_PERF_BIAS message
  x86, msr: Fix typo in ENERGY_PERF_BIAS_POWERSAVE
  x86, intel, power: Initialize MSR_IA32_ENERGY_PERF_BIAS
---

35b004cce1b0880876faecb8e0bd7cb2cb5a59d1