leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
81ad807b26
linux/drivers/net/ethernet/intel/e1000e
History
David S. Miller 4366004d77 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/intel/igb/e1000_mac.c
	net/core/filter.c

Both conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-24 13:19:00 -04:00
..
80003es2lan.c e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
80003es2lan.h e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
82571.c e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
82571.h e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
defines.h e1000e: Feature Enable PHY Ultra Low Power Mode (ULP) 2014-03-07 22:52:07 -08:00
e1000.h e1000e: Cleanup checkpatch extra space 2014-04-23 01:07:39 -07:00
ethtool.c e1000e: Cleanup to fix checkpatch missing blank lines 2014-04-23 01:05:08 -07:00
hw.h e1000e: Feature Enable PHY Ultra Low Power Mode (ULP) 2014-03-07 22:52:07 -08:00
ich8lan.c e1000e: Cleanup to fix checkpatch missing blank lines 2014-04-23 01:05:08 -07:00
ich8lan.h e1000e: Fix SHRA register access for 82579 2014-03-07 23:56:16 -08:00
mac.c e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
mac.h e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
Makefile e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
manage.c e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
manage.h e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-04-24 13:19:00 -04:00
nvm.c e1000e: Cleanup to fix checkpatch missing blank lines 2014-04-23 01:05:08 -07:00
nvm.h e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
param.c e1000e: Cleanup to fix checkpatch missing blank lines 2014-04-23 01:05:08 -07:00
phy.c e1000e: Cleanup to fix checkpatch missing blank lines 2014-04-23 01:05:08 -07:00
phy.h e1000e: Cleanup - Update GPL header and Copyright 2014-03-07 21:55:27 -08:00
ptp.c ptp: drivers: set the number of programmable pins. 2014-03-21 14:21:14 -04:00
regs.h e1000e: Feature Enable PHY Ultra Low Power Mode (ULP) 2014-03-07 22:52:07 -08:00