| commit | e0ada51db907ed2db5d46ad7ff86a8b5df68e59b | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Apr 21 16:31:52 2018 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sat Apr 21 16:32:48 2018 -0400 |
| tree | 858966cee69ad8a50e59c4e02dcbde6ba2916151 | |
| parent | 0638eb573cde5888c0886c7f35da604e5db209a6 [diff] | |
| parent | 83beed7b2b26f232d782127792dd0cd4362fdc41 [diff] |
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>