linux_dsm_epyc7002/drivers/net/ethernet/aquantia
David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-06-15 11:59:32 -04:00
..
atlantic Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-06-15 11:59:32 -04:00
Kconfig net: ethernet: aquantia: Make and configuration files. 2017-01-24 15:03:38 -05:00
Makefile net: ethernet: aquantia: Make and configuration files. 2017-01-24 15:03:38 -05:00