-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authored
Conflicts were simple overlapping changes in microchip driver. Signed-off-by:David S. Miller <davem@davemloft.net>
e0ada51d
Conflicts were simple overlapping changes in microchip
driver.
Signed-off-by: David S. Miller <davem@davemloft.net>