diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 16:38:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-11 16:38:26 -0800 |
commit | 8233008f5d9703207c2a725cbfb7fd00e7e025e6 (patch) | |
tree | 5b742fa40ba8021f81fcd4b07b6f6a8d82a7ae33 /net/dccp/output.c | |
parent | 4fb68f9789cf80817c16462f070a9107febc1478 (diff) | |
parent | bc79c9851a76d76f269d9ef5150e180825650b67 (diff) | |
download | linux-8233008f5d9703207c2a725cbfb7fd00e7e025e6.tar.bz2 |
Merge tag 'pci-v4.9-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
- Update MAINTAINERS for Intel VMD driver filename
- Update Rockchip rk3399 host bridge driver DTS and resets
- Fix ROM shadow problem that made some video device initialization
fail
* tag 'pci-v4.9-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: VMD: Update filename to reflect move
arm64: dts: rockchip: add three new resets for rk3399 PCIe controller
PCI: rockchip: Add three new resets as required properties
PCI: Don't attempt to claim shadow copies of ROM
Diffstat (limited to 'net/dccp/output.c')
0 files changed, 0 insertions, 0 deletions