From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Mar 2016 19:26:04 +0000 (-0700)
Subject: Merge tag 'pci-v4.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
X-Git-Tag: v4.14-rc1~3572
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc739eba99dc8655369a07ead098de9960e48fff;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'pci-v4.6-fixes-1' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fixes from Bjorn Helgaas:
 "Here are two fixes for v4.6:

   - You merged a fix for a TI DRA7xx reset issue from another source,
     so Sekhar removed the "broken" tag from the driver, and

   - I botched a Kconfig merge and broke hotplug configuration for
     everybody, so Tero fixed that.

  Summary:

  TI DRA7xx host bridge driver:
    Revert "PCI: dra7xx: Mark driver as broken" (Sekhar Nori)

  Miscellaneous:
    Restore inclusion of pci/hotplug Kconfig (Tero Roponen)"

* tag 'pci-v4.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "PCI: dra7xx: Mark driver as broken"
  PCI: Restore inclusion of pci/hotplug Kconfig
---

fc739eba99dc8655369a07ead098de9960e48fff