diff options
| author | David S. Miller | 2020-02-21 13:39:34 -0800 |
|---|---|---|
| committer | David S. Miller | 2020-02-21 13:39:34 -0800 |
| commit | e65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06 (patch) | |
| tree | 04b1728c397ad4604a6163529f51dfd48dfdbc07 /usr | |
| parent | b4d9785ce5c035b672f25df56706d0ff4e68b74e (diff) | |
| parent | 0c0ddd6ae47c9238c18f475bcca675ca74c9dc31 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions