From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Feb 2012 15:55:51 +0000 (-0800)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~3467
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e25bda564299e431200d1e0e1a229679f45437aa;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce/AMD: Fix UP build error
  x86: Specify a size for the cmp in the NMI handler
  x86/nmi: Test saved %cs in NMI to determine nested NMI case
  x86/amd: Fix L1i and L2 cache sharing information for AMD family 15h processors
  x86/microcode: Remove noisy AMD microcode warning
---

e25bda564299e431200d1e0e1a229679f45437aa