From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 May 2016 18:41:05 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.6~25
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/7ec02e3bf45e0e7502db7f8d50c19abc1ebbab00

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

Pull x86 fixes from Ingo Molnar:
 "Two topology corner case fixes, and a MAINTAINERS file update for
  mmiotrace maintenance"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/topology: Set x86_max_cores to 1 for CONFIG_SMP=n
  MAINTAINERS: Add mmiotrace entry
  x86/topology: Handle CPUID bogosity gracefully
---

7ec02e3bf45e0e7502db7f8d50c19abc1ebbab00