1
0
Fork 0
alistair23-linux/drivers/net/ethernet/ibm
David S. Miller 6f41617bf2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-10-03 21:00:17 -07:00
..
ehea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-10-03 21:00:17 -07:00
emac Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-09-25 10:35:29 -07: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
ibmveth.c net: ethernet: remove redundant include 2018-09-18 20:07:27 -07: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 2018-10-03 21:00:17 -07:00
ibmvnic.h ibmvnic: Add ethtool private flag for driver-defined queue limits 2018-10-01 23:31:16 -07:00