tree 2c9ccda87c278dafb96de45c3d06d54c922a803b
parent 30de24c7dd21348b142ee977b687afc70b392af6
parent d79d024820f2e522ab30b5e6662c245f887c752b
author Linus Torvalds <torvalds@linux-foundation.org> 1534201706 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1534201706 -0700

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

Pull x86 platform updates from Thomas Gleixner:
 "Trivial cleanups and improvements"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/UV: Remove redundant check of p == q
  x86/platform/olpc: Use PTR_ERR_OR_ZERO()
  x86/platform/UV: Mark memblock related init code and data correctly