From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Apr 2014 19:04:15 +0000 (-0700)
Subject: Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.15-rc1~29
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=40e9963e622cf28ecef258e3dddb04457b65681c;p=linux-2.6-block.git

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

Pullx86 core platform updates from Peter Anvin:
 "This is the x86/platform branch with the objectionable IOSF patches
  removed.

  What is left is proper memory handling for Intel GPUs, and a change to
  the Calgary IOMMU code which will be required to make kexec work
  sanely on those platforms after some upcoming kexec changes"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, calgary: Use 8M TCE table size by default
  x86/gpu: Print the Intel graphics stolen memory range
  x86/gpu: Add Intel graphics stolen memory quirk for gen2 platforms
  x86/gpu: Add vfunc for Intel graphics stolen memory base address
---

40e9963e622cf28ecef258e3dddb04457b65681c