diff options
| author | David S. Miller <davem@davemloft.net> | 2018-04-21 23:31:52 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-04-21 23:32:48 +0300 |
| commit | e0ada51db907ed2db5d46ad7ff86a8b5df68e59b (patch) | |
| tree | 858966cee69ad8a50e59c4e02dcbde6ba2916151 /drivers/net/ethernet/sfc/vfdi.h | |
| parent | 0638eb573cde5888c0886c7f35da604e5db209a6 (diff) | |
| parent | 83beed7b2b26f232d782127792dd0cd4362fdc41 (diff) | |
| download | linux-e0ada51db907ed2db5d46ad7ff86a8b5df68e59b.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simple overlapping changes in microchip
driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/vfdi.h')
0 files changed, 0 insertions, 0 deletions