tree 94e7540f4996e15f717001eb08e21dd59c42c0fd
parent 148086bb64694cc91624bab2a550d50f800eb4b7
parent 818987e9a19c52240ba9b1c20f28f047eef76072
author Linus Torvalds <torvalds@linux-foundation.org> 1301931465 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1301931465 -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, UV: Fix kdump reboot
  x86, amd-nb: Rename CPU PCI id define for F4
  sound: Add delay.h to sound/soc/codecs/sn95031.c
  x86, mtrr, pat: Fix one cpu getting out of sync during resume
  x86, microcode: Unregister syscore_ops after microcode unloaded
  x86: Stop including <linux/delay.h> in two asm header files