-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net由 David S. Miller 提交于
The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: NDavid S. Miller <davem@davemloft.net>0ddead90
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>