From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Apr 2011 15:37:45 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.39-rc2~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d7c764c4c7b782c660b4600b0bff2e3509892a4d;p=users%2Fjedix%2Flinux-maple.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, 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
---

d7c764c4c7b782c660b4600b0bff2e3509892a4d