linux/drivers/net/ethernet/intel/i40e
David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-18 16:42:06 -05:00
..
i40e_adminq_cmd.h i40e: init code and hardware support 2013-09-11 02:12:25 -07:00
i40e_adminq.c i40e: make functions static and remove dead code 2013-12-17 22:42:49 -08:00
i40e_adminq.h i40e: simplify aq head-tail-len setups 2013-12-05 23:12:58 -08:00
i40e_alloc.h i40e: init code and hardware support 2013-09-11 02:12:25 -07:00
i40e_common.c i40e: make functions static and remove dead code 2013-12-17 22:42:49 -08:00
i40e_debugfs.c i40e: Fix off by one in i40e_dbg_command_write 2013-12-17 22:42:44 -08:00
i40e_diag.c i40e: trivial fixes 2013-12-16 00:49:22 -08:00
i40e_diag.h i40e: loopback info and set loopback fix 2013-12-10 01:27:30 -08:00
i40e_ethtool.c i40e: Add basic support for get/set channels for RSS 2013-12-16 01:02:48 -08:00
i40e_hmc.c i40e: trivial fixes 2013-12-16 00:49:22 -08:00
i40e_hmc.h i40e: init code and hardware support 2013-09-11 02:12:25 -07:00
i40e_lan_hmc.c i40e: init code and hardware support 2013-09-11 02:12:25 -07:00
i40e_lan_hmc.h i40e: sync header files with hardware 2013-12-05 23:25:17 -08:00
i40e_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
i40e_nvm.c i40e: init code and hardware support 2013-09-11 02:12:25 -07:00
i40e_osdep.h i40e: driver core headers 2013-09-11 01:58:15 -07:00
i40e_prototype.h i40e: make functions static and remove dead code 2013-12-17 22:42:49 -08:00
i40e_register.h i40e: whitespace 2013-12-06 16:41:50 -08:00
i40e_status.h i40e: init code and hardware support 2013-09-11 02:12:25 -07:00
i40e_txrx.c i40e: check multi-bit state correctly 2013-12-06 16:10:30 -08:00
i40e_txrx.h i40e: remove and fix confusing define name 2013-12-10 01:27:31 -08:00
i40e_type.h i40e: fix up some of the ethtool connection reporting 2013-12-16 00:48:37 -08:00
i40e_virtchnl_pf.c i40e: Remove FCoE in i40e_virtchnl_pf.c code 2013-12-16 01:08:04 -08:00
i40e_virtchnl_pf.h i40e: implement virtual device interface 2013-09-11 02:04:56 -07:00
i40e_virtchnl.h i40e: implement virtual device interface 2013-09-11 02:04:56 -07:00
i40e.h i40e: support for suspend and resume 2013-12-16 01:07:55 -08:00
Makefile i40e: include i40e in kernel proper 2013-09-11 02:28:40 -07:00