David S. Miller a06ee256e5 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Version bump conflict in batman-adv, take what's in net-next. iavf conflict, adjustment of netdev_ops in net-next conflicting with poll controller method removal in net. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-09-25 10:35:29 -07:00
..
ixgb_ee.c	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb_ee.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb_ethtool.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
ixgb_hw.c	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb_hw.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb_ids.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb_main.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-09-25 10:35:29 -07:00
ixgb_osdep.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb_param.c	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb.h	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
Makefile	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00