Bjorn Helgaas 9454c23852 Merge branch 'pci/msi-affinity' into next ... Conflicts: drivers/nvme/host/pci.c		2016-08-01 12:34:01 -05:00
..
80003es2lan.c	e1000e: use BIT() macro for bit defines	2016-05-13 15:15:36 -07:00
80003es2lan.h
82571.c	e1000e: use BIT() macro for bit defines	2016-05-13 15:15:36 -07:00
82571.h
defines.h
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
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
Makefile
manage.c
manage.h
netdev.c	Merge branch 'pci/msi-affinity' into next	2016-08-01 12:34:01 -05:00
nvm.c	e1000e: use BIT() macro for bit defines	2016-05-13 15:15:36 -07:00
nvm.h
param.c
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