68aaf44595
Minor conflict in r8169, bug fix had two versions in net and net-next, take the net-next hunks. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| endpoint | ||
| acpi-info.rst | ||
| index.rst | ||
| msi-howto.rst | ||
| pci-error-recovery.rst | ||
| pci-iov-howto.rst | ||
| pci.rst | ||
| pcieaer-howto.rst | ||
| pciebus-howto.rst | ||