From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Jun 2013 23:28:15 +0000 (-0700)
Subject: Merge tag 'pci-v3.10-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: v3.10-rc5~21
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c51aa6db2a599b49d53668008f845c670694beb7;p=~andy%2Flinux

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

Pull PCI fixes from Bjorn Helgaas:
 "This fixes a crash when booting a 32-bit kernel via the EFI boot stub.

  PCI ROM from EFI
      x86/PCI: Map PCI setup data with ioremap() so it can be in highmem"

* tag 'pci-v3.10-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  x86/PCI: Map PCI setup data with ioremap() so it can be in highmem
---

c51aa6db2a599b49d53668008f845c670694beb7