-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authored
The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by:David S. Miller <davem@davemloft.net>
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authoredThe conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by:
Loading