tree 0bab4c8ee082bd2eec9478c484a3d451abafede2
parent f54b2fe4aef9aa74ddf2c856928c3e29f3371fe7
parent 07db1c140eb233971341396e492cc73d4280e698
author Linus Torvalds <torvalds@linux-foundation.org> 1235063675 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1235063675 -0800

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, mce: fix ifdef for 64bit thermal apic vector clear on shutdown
  x86, mce: use force_sig_info to kill process in machine check
  x86, mce: reinitialize per cpu features on resume
  x86, rcu: fix strange load average and ksoftirqd behavior