leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f188b951f3
linux/drivers/net/ethernet/intel/fm10k
History
David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-03 21:09:12 -05:00
..
fm10k_common.c fm10k: Resolve various spelling errors and checkpatch warnings 2015-03-03 01:07:23 -08:00
fm10k_common.h fm10k: Add support for ptp to hw specific files 2014-09-23 03:59:22 -07:00
fm10k_dcbnl.c fm10k: fix unused warnings 2015-04-14 15:23:36 -07:00
fm10k_debugfs.c fm10k: use snprintf() instead of sprintf() to avoid buffer overflow 2015-10-13 23:49:13 -07:00
fm10k_ethtool.c drivers/net: get rid of unnecessary initializations in .get_drvinfo() 2015-10-16 00:24:10 -07:00
fm10k_iov.c fm10k: add support for extra debug statistics 2015-09-22 15:58:27 -07:00
fm10k_main.c fm10k: Fix handling of NAPI budget when multiple queues are enabled per vector 2015-11-23 11:08:49 -08:00
fm10k_mbx.c fm10k: TRIVIAL remove unnecessary comma 2015-09-22 15:58:27 -07:00
fm10k_mbx.h fm10k: Add support for PF <-> VF mailbox 2014-09-23 03:59:20 -07:00
fm10k_netdev.c fm10k: fix memory leak 2015-11-18 14:58:03 -05:00
fm10k_pci.c fm10k: use napi_schedule_irqoff() 2015-11-25 10:05:54 -08:00
fm10k_pf.c fm10k: fix iov_msg_mac_vlan_pf VID checks 2015-09-15 17:06:23 -07:00
fm10k_pf.h fm10k: pack TLV overlay structures 2015-06-17 14:21:22 -07:00
fm10k_ptp.c fm10k: fix incorrect free on skb in ts_tx_enqueue 2015-06-17 14:20:36 -07:00
fm10k_tlv.c fm10k: Resolve various spelling errors and checkpatch warnings 2015-03-03 01:07:23 -08:00
fm10k_tlv.h fm10k: Add support for mailbox 2014-09-23 03:59:14 -07:00
fm10k_type.h fm10k: do not assume VF always has 1 queue 2015-11-23 11:08:47 -08:00
fm10k_vf.c fm10k: do not assume VF always has 1 queue 2015-11-23 11:08:47 -08:00
fm10k_vf.h fm10k: Add support for ptp to hw specific files 2014-09-23 03:59:22 -07:00
fm10k.h fm10k: Correct MTU for jumbo frames 2015-11-23 11:08:47 -08:00
Makefile fm10k: Add support for PTP 2014-09-23 03:59:23 -07:00