David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
bnxt_ethtool.c
bnxt_ethtool.h
bnxt_fw_hdr.h
bnxt_hsi.h
bnxt_nvm_defs.h
bnxt_sriov.c	bnxt_en: Change bp->state to bitmap.	2015-12-11 23:34:06 -05:00
bnxt_sriov.h
bnxt.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
bnxt.h	bnxt_en: Don't cancel sp_task from bnxt_close_nic().	2015-12-11 23:34:06 -05:00
Makefile