aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-14 02:31:22 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-14 02:31:22 +0200
commit77654908ff1a58cee4886298968b5262884aff0b (patch)
tree1e46ab27f369a14b4c48be566383c4c2246b6db4 /scripts
parent2fd7476de999124bbf6830aa59ac092c882280fe (diff)
parentd286c3af48e3ad187fc52a0060c71b0844f234ff (diff)
parent8091c1f8ea2374695c105591179b1269fb5f2fbb (diff)
parentf12c1f9002d27374fd205f6e692891116ca22272 (diff)
downloadlinux-77654908ff1a58cee4886298968b5262884aff0b.tar.gz
Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/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