From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Oct 2018 17:17:11 +0000 (+0100)
Subject: Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.20-rc1~157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7197a5ad8528642cb70f1d27d4d5c7332a2b395;p=thirdparty%2Fkernel%2Flinux.git

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

Pull x86 platform updates from Ingo Molnar:
 "Two minor OLPC changes: a build fix and a new quirk"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/olpc: Fix build error with CONFIG_MFD_CS5535=m
  x86/olpc: Indicate that legacy PC XO-1 platform should not register RTC
---

d7197a5ad8528642cb70f1d27d4d5c7332a2b395