From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 May 2011 00:49:35 +0000 (-0700)
Subject: Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-for-linus... 
X-Git-Tag: firefly_0821_release~7613^2~1389
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=17b141803c6c6e27fbade3f97c1c9d8d66c72866;p=firefly-linux-kernel-4.4.55.git

Merge branches 'x86-apic-for-linus', 'x86-asm-for-linus' and 'x86-cleanups-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, apic: Print verbose error interrupt reason on apic=debug

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Demacro CONFIG_PARAVIRT cpu accessors

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix mrst sparse complaints
  x86: Fix spelling error in the memcpy() source code comment
  x86, mpparse: Remove unnecessary variable
---

17b141803c6c6e27fbade3f97c1c9d8d66c72866