diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:12 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:12 -0500 |
commit | f19013248ea2cd79ff73be982396d950e3870d25 (patch) | |
tree | fb6249a323a8c0f35f495a9df8a51fd5ca8d33a8 /net/l2tp | |
parent | 3a749ea1c0271cbadf234befe307f14267325836 (diff) | |
parent | 8fc614c0ae5cb5df11d6aa9559e63baacf20a840 (diff) | |
download | linux-f19013248ea2cd79ff73be982396d950e3870d25.tar.bz2 |
Merge branch 'pci/aer' into next
* pci/aer:
PCI/AER: Reformat AER register definitions
PCI/portdrv: Move error handler methods to struct pcie_port_service_driver
Diffstat (limited to 'net/l2tp')
0 files changed, 0 insertions, 0 deletions