mirror_ubuntu-kernels/drivers/net/ethernet/ibm
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
..
ehea net: ibm: ehea: use new api ethtool_{get|set}_link_ksettings 2017-01-09 12:09:09 -05:00
emac Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-06-15 11:59:32 -04:00
ibmveth.c ibmveth: Support to enable LSO/CSO for Trunk VEA. 2017-05-21 13:29:01 -04:00
ibmveth.h ibmveth: Support to enable LSO/CSO for Trunk VEA. 2017-05-21 13:29:01 -04:00
ibmvnic.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-06-15 11:59:32 -04:00
ibmvnic.h ibmvnic: Non-fatal error handling 2017-05-26 15:32:45 -04:00
Kconfig Driver for IBM System i/p VNIC protocol 2015-12-28 00:12:13 -05:00
Makefile Driver for IBM System i/p VNIC protocol 2015-12-28 00:12:13 -05:00