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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mce: don't restart timer if disabled
  x86: Use -maccumulate-outgoing-args for sane mcount prologues
  x86: Prevent GCC 4.4.x (pentium-mmx et al) function prologue wreckage
  x86: AMD Northbridge: Verify NB's node is online
  x86 VSDO: Fix Kconfig help
  x86: Fix typo in Intel CPU cache size descriptor
  x86: Add new Intel CPU cache size descriptors

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Makefile_32.cpu
Simple merge

diff --cc arch/x86/kernel/cpu/intel_cacheinfo.c
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge