From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Aug 2018 23:08:26 +0000 (-0700)
Subject: Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: for-linus-20180825~146
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7edcf0d314f69e506ddd9562062b2a79fa965bb9;p=linux-2.6-block.git

Merge branch 'x86-platform-for-linus' of git://git./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
---

7edcf0d314f69e506ddd9562062b2a79fa965bb9