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
..
e1000	drivers/net/ethernet: Fix non-kernel-doc comments with kernel-doc start markers	2012-07-10 23:13:46 -07:00
e1000e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-19 11:17:30 -07:00
igb	ethernet: Use eth_random_addr	2012-07-16 22:38:27 -07:00
igbvf	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgb	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgbe	ixgbe: Cleanup holes in flags after removing several of them	2012-07-18 13:30:08 -07:00
ixgbevf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-19 11:17:30 -07:00
e100.c	net: e100: ucode is optional in some cases	2012-07-19 10:48:07 -07:00
Kconfig	Kconfig: Fix Kconfig for Intel ixgbe and igb PTP support.	2012-06-20 00:52:54 -07:00
Makefile	intel: Move the Intel wired LAN drivers	2011-08-10 20:03:27 -07:00