| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Jun 22 08:59:24 2019 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Jun 22 08:59:24 2019 -0400 |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 | |
| parent | e0effb5fbd56a8b2b8917611cbf4fcd9aba92b8f [diff] | |
| parent | c356dc4b540edd6c02b409dd8cf3208ba2804c38 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Minor SPDX change conflict. Signed-off-by: David S. Miller <davem@davemloft.net>