From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Mar 2014 23:15:54 +0000 (-0700)
Subject: Merge tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c1cfacca2083db519317f49f31e143d97fd554a;p=linux-beck.git

Merge tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI resource management fix from Bjorn Helgaas:
 "This is a fix for an AGP regression exposed by e501b3d87f00 ("agp:
  Support 64-bit APBASE"), which we merged in v3.14-rc1.

  We've warned about the conflict between the GART and PCI resources and
  cleared out the PCI resource for a long time, but after e501b3d87f00,
  we still *use* that cleared-out PCI resource.  I think the GART
  resource is incorrect, so this patch removes it"

* tag 'pci-v3.14-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "[PATCH] Insert GART region into resource map"
---

7c1cfacca2083db519317f49f31e143d97fd554a