From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 9 May 2013 17:21:44 +0000 (-0700)
Subject: Merge tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: v4.0~4094
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e15e6119062d20cc96f95c8b345e361589a90244;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'pci-v3.10-fixes-1' of git://git./linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:
 "MSI:
      PCI: Set ->mask_pos correctly
  Hotplug:
      PCI: Delay final fixups until resources are assigned
  Moorestown:
      x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0"

* tag 'pci-v3.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Delay final fixups until resources are assigned
  x86/pci/mrst: Use configuration mechanism 1 for 00:00.0, 00:02.0, 00:03.0
  PCI: Set ->mask_pos correctly
---

e15e6119062d20cc96f95c8b345e361589a90244