diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 12:26:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 12:26:04 -0700 |
| commit | fc739eba99dc8655369a07ead098de9960e48fff (patch) | |
| tree | 1fe9f12f793e8075645228d9ec4ea08e85698ffa /drivers/scsi/aha1542.h | |
| parent | 87cf815b9e78af20bf139aa7536b42be2ce405c5 (diff) | |
| parent | 9188269a2e8ea5b32affef99d42c5eda91c07fdf (diff) | |
| download | op-kernel-dev-fc739eba99dc8655369a07ead098de9960e48fff.zip op-kernel-dev-fc739eba99dc8655369a07ead098de9960e48fff.tar.gz | |
Merge tag 'pci-v4.6-fixes-1' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/scsi/aha1542.h')
0 files changed, 0 insertions, 0 deletions
