David S. Miller abaa72d7fd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c		2012-07-19 11:17:30 -07:00
..
defines.h	ixgbevf: Consolidate Tx context descriptor creation code	2012-07-18 13:16:37 -07:00
ethtool.c	ixgbevf: Fix multiple issues in ixgbevf_get/set_ringparam	2012-07-18 13:18:24 -07:00
ixgbevf.h	ixgbevf: Add netdev to ring structure	2012-07-18 13:14:36 -07:00
ixgbevf_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-19 11:17:30 -07:00
Makefile	ixgbevf: Update copyright notices	2012-02-03 03:07:09 -08:00
mbx.c	ixgbevf: Update copyright notices	2012-02-03 03:07:09 -08:00
mbx.h	ixgbevf: Update copyright notices	2012-02-03 03:07:09 -08:00
regs.h	ixgbevf: Update copyright notices	2012-02-03 03:07:09 -08:00
vf.c	ixgbevf: Add support to recognize 100mb link speed	2012-05-03 02:36:07 -07:00
vf.h	ixgbevf: Update copyright notices	2012-02-03 03:07:09 -08:00