David S. Miller 6f14f443d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Mostly simple cases of overlapping changes (adding code nearby,
a function whose name changes, for example).

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-04-06 08:24:51 -07:00

..

80003es2lan.c

e1000e: use BIT() macro for bit defines

2016-05-13 15:15:36 -07:00

80003es2lan.h

e1000e: Bump the version to 3.2.5

2015-06-03 04:13:39 -07:00

82571.c

e1000e: factor out systim sanitization

2016-08-16 10:46:19 -07:00

82571.h

e1000e: Bump the version to 3.2.5

2015-06-03 04:13:39 -07:00

defines.h

e1000e: Adds hardware supported cross timestamp on e1000e nic

2016-03-03 14:28:46 -08:00

e1000.h

net: make ndo_get_stats64 a void function

2017-01-08 17:51:44 -05:00

ethtool.c

e1000e: use new API ethtool_{get|set}_link_ksettings

2017-03-21 15:31:30 -07:00

hw.h

e1000e: Initial support for KabeLake

2016-02-24 14:53:30 -08:00

ich8lan.c

e1000e: fix PTP on e1000_pch_lpt variants

2016-08-16 10:47:20 -07:00

ich8lan.h

e1000e: mark shifted values as unsigned

2016-05-13 15:19:05 -07:00

mac.c

e1000e: use BIT() macro for bit defines

2016-05-13 15:15:36 -07:00

mac.h

e1000e: Bump the version to 3.2.5

2015-06-03 04:13:39 -07:00

Makefile

e1000e: Cleanup - Update GPL header and Copyright

2014-03-07 21:55:27 -08:00

manage.c

e1000e: Bump the version to 3.2.5

2015-06-03 04:13:39 -07:00

manage.h

e1000e: Bump the version to 3.2.5

2015-06-03 04:13:39 -07:00

netdev.c

Revert "e1000e: driver trying to free already-free irq"

2017-03-24 13:43:11 -07:00

nvm.c

e1000e: use BIT() macro for bit defines

2016-05-13 15:15:36 -07:00

nvm.h

e1000e: Bump the version to 3.2.5

2015-06-03 04:13:39 -07:00

param.c

e1000e: Bump the version to 3.2.5

2015-06-03 04:13:39 -07:00

phy.c

e1000e: use BIT() macro for bit defines

2016-05-13 15:15:36 -07:00

phy.h

e1000e: use BIT() macro for bit defines

2016-05-13 15:15:36 -07:00

ptp.c

clocksource: Use a plain u64 instead of cycle_t

2016-12-25 11:04:12 +01:00

regs.h

e1000e: Adds hardware supported cross timestamp on e1000e nic

2016-03-03 14:28:46 -08:00