diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-21 13:48:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-21 13:48:58 -0400 |
| commit | e59f30b417499414a1f9afaaad3a42937060832f (patch) | |
| tree | 7bc3aee15bff7c40fcab8bc2d6c003b5507a5a06 /MAINTAINERS | |
| parent | ec366cd195d0f3dcfb851b5574901c0dbc51b75a (diff) | |
| parent | 02a1b8f4167eac709d269341f7c3c340984c28a6 (diff) | |
Merge tag 'pci-v4.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"This includes:
- Fix for a Layerscape driver issue that causes a use-before-set
crash
- Maintainer update for the Synopsis prototyping device driver"
* tag 'pci-v4.9-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: designware-plat: Update author email address
PCI: layerscape: Fix drvdata usage before assignment
PCI: designware-plat: Change maintainer to Jose Abreu
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c72fa185c374..b6c28e1b5876 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -9299,7 +9299,7 @@ S: Maintained | |||
| 9299 | F: drivers/pci/host/*designware* | 9299 | F: drivers/pci/host/*designware* |
| 9300 | 9300 | ||
| 9301 | PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE | 9301 | PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE |
| 9302 | M: Joao Pinto <jpinto@synopsys.com> | 9302 | M: Jose Abreu <Jose.Abreu@synopsys.com> |
| 9303 | L: linux-pci@vger.kernel.org | 9303 | L: linux-pci@vger.kernel.org |
| 9304 | S: Maintained | 9304 | S: Maintained |
| 9305 | F: Documentation/devicetree/bindings/pci/designware-pcie.txt | 9305 | F: Documentation/devicetree/bindings/pci/designware-pcie.txt |