]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite16d93ef08504d3d7bf464caf8502d9e85607c22
treedfaa26ab107c32d4a82deb4a060e310499fdafb9
parent47466fedc086e4de9d942823edbaf4e6c7c5c1e7
parent2cb54411c40cb5bb4a0e408d8ffc81ae484310d8
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
arch/x86/Kconfig