David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c net/ipv6/ip6_tunnel.c net/ipv6/ip6_vti.c ipv6 tunnel statistic bug fixes conflicting with consolidation into generic sw per-cpu net stats. qlogic conflict between queue counting bug fix and the addition of multiple MAC address support. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-01-06 17:37:45 -05:00
..
80003es2lan.c	e1000e: fix compiler warning (maybe-unitialized variable)	2013-12-17 22:20:49 -08:00
80003es2lan.h
82571.c	e1000e: balance semaphore put/get for 82573	2013-08-27 16:05:26 -04:00
82571.h	e1000e: cleanup - move defines to appropriate header file	2013-03-08 01:53:29 -08:00
defines.h	e1000e: slow performance between two 82579 connected via 10Mbit hub	2013-03-27 23:25:36 -07:00
e1000.h	intel: Remove extern from function prototypes	2013-09-24 12:51:37 -07:00
ethtool.c	e1000e: fix overrun of PHY RAR array	2013-09-13 10:19:56 -07:00
hw.h	e1000e: cleanup whitespace in recent commit	2013-08-22 02:33:05 -07:00
ich8lan.c	e1000e: fix overrun of PHY RAR array	2013-09-13 10:19:56 -07:00
ich8lan.h	e1000e: fix overrun of PHY RAR array	2013-09-13 10:19:56 -07:00
mac.c	e1000e: fix LED blink logic for designs with LEDs driven by cathode	2013-03-27 23:32:06 -07:00
mac.h
Makefile
manage.c
manage.h
netdev.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
nvm.c	e1000e: cleanup whitespace	2013-05-21 02:07:01 -07:00
nvm.h
param.c	e1000e: cleanup format of struct e1000_opt_list struct	2013-03-08 01:35:16 -08:00
phy.c	e1000e: fix compiler warnings	2013-12-17 21:52:39 -08:00
phy.h
ptp.c	e1000e: fix numeric overflow in phc settime method	2013-04-25 18:30:02 -07:00
regs.h