diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:02:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:02:54 -0700 |
| commit | 35b004cce1b0880876faecb8e0bd7cb2cb5a59d1 (patch) | |
| tree | 84ac064e56be49bd57b383392531c5c5ebe0c455 /kernel/time/ntp.c | |
| parent | 0a613b647bac0cfab7b7d81f11271883209a70ef (diff) | |
| parent | 17edf2d79f1ea6dfdb4c444801d928953b9f98d6 (diff) | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel/time/ntp.c')
0 files changed, 0 insertions, 0 deletions