| commit | d7197a5ad8528642cb70f1d27d4d5c7332a2b395 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 23 18:17:11 2018 +0100 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 23 18:17:11 2018 +0100 |
| tree | dfaa26ab107c32d4a82deb4a060e310499fdafb9 | |
| parent | f682a7920baf7b721d01dd317f3b532265357cbb [diff] | |
| parent | fa112cf1e8bc693d5a666b1c479a2859c8b6e0f1 [diff] |
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