Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:31:22 +0000 (02:31 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:31:22 +0000 (02:31 +0200)
commit77654908ff1a58cee4886298968b5262884aff0b
tree1e46ab27f369a14b4c48be566383c4c2246b6db4
parent2fd7476de999124bbf6830aa59ac092c882280fe
parentd286c3af48e3ad187fc52a0060c71b0844f234ff
parent8091c1f8ea2374695c105591179b1269fb5f2fbb
parentf12c1f9002d27374fd205f6e692891116ca22272
Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 ras, uv and vdso fixlets from Ingo Molnar:
 "ras: tone down a kernel message to only occur during initial bootup,
    not during suspend/resume cycles.

  uv: a cleanup commit

  vdso: a fix to error checking"

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mce: Avoid showing repetitive message from intel_init_thermal()

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic/uv: Remove unnecessary #ifdef

* 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Fix vdso2c's special_pages[] error checking
arch/x86/kernel/apic/x2apic_uv_x.c