tree 062984c6837da9a6284deba13b02a52418ebfe98
parent 0acc1b2afb6ded060b7d6b1b5e6ac8a00ec47547
parent 73cf624d029d776a33d0a80c695485b3f9b36231
author Linus Torvalds <torvalds@linux-foundation.org> 1287012863 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287012863 -0700

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, numa: For each node, register the memory blocks actually used
  x86, AMD, MCE thresholding: Fix the MCi_MISCj iteration order
  x86, mce, therm_throt.c: Fix missing curly braces in error handling logic