David S. Miller ac80010fc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Mere overlapping changes in the conflicts here.

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

2019-12-22 15:15:05 -08:00

..

ixgb_ee.c

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00

ixgb_ee.h

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00

ixgb_ethtool.c

treewide: Use sizeof_field() macro

2019-12-09 10:36:44 -08:00

ixgb_hw.c

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00

ixgb_hw.h

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00

ixgb_ids.h

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00

ixgb_main.c

netdev: pass the stuck queue to the timeout handler

2019-12-12 21:38:57 -08:00

ixgb_osdep.h

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00

ixgb_param.c

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00

ixgb.h

PCI: Add PCI_STD_NUM_BARS for the number of standard BARs

2019-10-14 10:22:26 -05:00

Makefile

net: intel: Cleanup the copyright/license headers

2018-04-27 14:00:04 -04:00