diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:12 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-15 11:56:12 -0600 |
| commit | 4c2ae32d4c6ccd63819f36702f8455a5b08eaca8 (patch) | |
| tree | 8e17d472a0b714fb5798ebbfaaa60f45e6d5b7ec /net/lapb/lapb_timer.c | |
| parent | 8b9c156262f9ebaa88736b93263c1af5ae5fa43e (diff) | |
| parent | 4f69bd16df1a38c32d5d207a96d1d86df4808f87 (diff) | |
Merge branch 'pci/vpd' into next
* pci/vpd:
PCI: Increase VPD access timeout to 125ms
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions
