linux/drivers/net/ethernet/intel/fm10k
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
..
fm10k_common.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_common.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_dcbnl.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_debugfs.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_ethtool.c treewide: Use array_size() in vmalloc() 2018-06-12 16:19:22 -07:00
fm10k_iov.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_main.c intel-ethernet: use correct module license 2018-09-18 15:32:59 -07:00
fm10k_mbx.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_mbx.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_netdev.c fm10k: remove ndo_poll_controller 2018-09-23 21:55:24 -07:00
fm10k_pci.c fm10k: remove ndo_poll_controller 2018-09-23 21:55:24 -07:00
fm10k_pf.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_pf.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_tlv.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_tlv.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_type.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_vf.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_vf.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k.h fm10k: remove ndo_poll_controller 2018-09-23 21:55:24 -07:00
Makefile net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00