David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
Makefile	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k.h	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_common.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_common.h	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_dcbnl.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_debugfs.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_ethtool.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_iov.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_main.c	fm10k: fix incorrect IPv6 extended header checksum	2016-04-20 23:07:34 -07:00
fm10k_mbx.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_mbx.h	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_netdev.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_pci.c	fm10k: protect fm10k_open in fm10k_io_resume with rtnl_lock	2016-04-21 15:35:43 -04:00
fm10k_pf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
fm10k_pf.h	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_tlv.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_tlv.h	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_type.h	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_vf.c	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00
fm10k_vf.h	fm10k: consistently use Intel(R) for driver names	2016-04-20 23:07:34 -07:00