diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 10:05:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-11 10:05:05 -0700 |
| commit | 50c6dc9ebad0f1abde192696bea94c3bd2f24c18 (patch) | |
| tree | 9b8c20551088a9a94d16c75421404872e3e820db /scripts/kconfig/conf.c | |
| parent | 6af0b78cf0d3b5b39fcd892e532e567b12b32b37 (diff) | |
| parent | d24a9da573444ab4aff38af2f4a0da07408ff491 (diff) | |
| download | op-kernel-dev-50c6dc9ebad0f1abde192696bea94c3bd2f24c18.zip op-kernel-dev-50c6dc9ebad0f1abde192696bea94c3bd2f24c18.tar.gz | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
IPS driver: Fix limit clamping when reducing CPU power
[PATCH 2/2] IPS driver: disable CPU turbo
IPS driver: apply BIOS provided CPU limit if different from default
intel_ips -- ensure we do not enable gpu turbo mode without driver linkage
intel_ips: Print MCP limit exceeded values.
IPS driver: verify BIOS provided limits
IPS driver: don't toggle CPU turbo on unsupported CPUs
NULL pointer might be used in ips_monitor()
Release symbol on error-handling path of ips_get_i915_syms()
old_cpu_power is wrongly divided by 65535 in ips_monitor()
seqno mask of THM_ITV register is 16bit
Diffstat (limited to 'scripts/kconfig/conf.c')
0 files changed, 0 insertions, 0 deletions
