From: Linus Torvalds Date: Mon, 11 Oct 2010 17:05:05 +0000 (-0700) Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf... X-Git-Tag: v2.6.36-rc8~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50c6dc9ebad0f1abde192696bea94c3bd2f24c18;p=platform%2Fkernel%2Flinux-3.10.git Merge branch 'for_linus' of git://git./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 --- 50c6dc9ebad0f1abde192696bea94c3bd2f24c18