David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
e1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
e1000e	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next	2012-08-31 16:03:33 -04:00
igb	ptp: link the phc device to its parent device	2012-09-22 15:42:38 -04:00
igbvf	drivers/net/ethernet: Fix (nearly-)kernel-doc comments for various functions	2012-07-10 23:13:46 -07:00
ixgb	ixgb: use PCI_VENDOR_ID_INTEL	2012-07-20 10:59:41 -07:00
ixgbe	ixgbe: Do not read the spoofed packets counter when not in IOV mode	2012-09-24 00:35:05 -07:00
ixgbevf	ixgbevf: Return error on failure to enable VLAN	2012-09-24 01:50:45 -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