From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Jan 2011 19:24:12 +0000 (+1000)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.38-rc3~71
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4398f31ca7989cbddca96267e3d018d440bac30e;p=~shefty%2Frdma-dev.git

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix jump label with RO/NX module protection crash
  x86, hotplug: Fix powersavings with offlined cores on AMD
  x86, mcheck, therm_throt.c: Export symbol platform_thermal_notify to allow coretemp to handler intr
  x86: Use asm-generic/cacheflush.h
  x86: Update CPU cache attributes table descriptors
---

4398f31ca7989cbddca96267e3d018d440bac30e