From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 May 2014 09:57:25 +0000 (+0900)
Subject: Merge tag 'pci-v3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: firefly_0821_release~176^2~3893
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=957cf2582adf2a2164bbbd87036138221c5c118a;p=firefly-linux-kernel-4.4.55.git

Merge tag 'pci-v3.15-fixes-2' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
 "These are fixes for an SHPCHP hotplug regression, a "wait for pending
  transaction" problem (used in device reset paths), and an email
  address update.

  PCI device hotplug:
    - Fix SHPCHP bus speed mismatch issue (Marcel Apfelbaum)

  Miscellaneous:
    - Fix pci_wait_for_pending_transaction() (Gavin Shan)
    - Update email address (Ben Hutchings)"

* tag 'pci-v3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Wrong register used to check pending traffic
  PCI: shpchp: Check bridge's secondary (not primary) bus speed
  PCI: Update my email address
---

957cf2582adf2a2164bbbd87036138221c5c118a