Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Oct 2018 17:17:11 +0000 (18:17 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Oct 2018 17:17:11 +0000 (18:17 +0100)
commitd7197a5ad8528642cb70f1d27d4d5c7332a2b395
treedfaa26ab107c32d4a82deb4a060e310499fdafb9
parentf682a7920baf7b721d01dd317f3b532265357cbb
parentfa112cf1e8bc693d5a666b1c479a2859c8b6e0f1
Merge branch 'x86-platform-for-linus' of git://git./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
arch/x86/Kconfig