korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-05 01:54:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
b401a9bce7
linux/drivers/net/ethernet/intel/e1000e
History
David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-07-06 10:35:22 -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: use BIT() macro for bit defines 2016-05-13 15:15:36 -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 e1000e: don't modify SYSTIM registers during SIOCSHWTSTAMP ioctl 2016-05-13 15:30:44 -07:00
ethtool.c e1000e: use BIT() macro for bit defines 2016-05-13 15:15:36 -07:00
hw.h e1000e: Initial support for KabeLake 2016-02-24 14:53:30 -08:00
ich8lan.c e1000e: use BIT() macro for bit defines 2016-05-13 15:15:36 -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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-07-06 10:35:22 -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 e1000e: don't modify SYSTIM registers during SIOCSHWTSTAMP ioctl 2016-05-13 15:30:44 -07:00
regs.h e1000e: Adds hardware supported cross timestamp on e1000e nic 2016-03-03 14:28:46 -08:00