David S. Miller 16ae1f2236 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/genet/bcmmii.c
	drivers/net/hyperv/netvsc.c
	kernel/bpf/hashtab.c

Almost entirely overlapping changes.

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

2017-03-23 16:41:27 -07:00

..

fjes_debugfs.c

fjes: Add debugfs entry for EP status information in fjes driver

2016-10-14 12:04:58 -04:00

fjes_ethtool.c

net: fjes: use new api ethtool_{get|set}_link_ksettings

2017-03-12 19:28:07 -07:00

fjes_hw.c

fjes: ethtool -w and -W support for fjes driver

2016-10-14 12:04:57 -04:00

fjes_hw.h

fjes: ethtool -w and -W support for fjes driver

2016-10-14 12:04:57 -04:00

fjes_main.c

fjes: Do not load fjes driver if extended socket device is not power on.

2017-03-22 12:38:17 -07:00

fjes_regs.h

fjes: net_device_ops.ndo_open and .ndo_stop

2015-08-24 14:06:34 -07:00

fjes_trace.c

fjes: Add tracepoints in fjes driver

2016-10-14 12:04:57 -04:00

fjes_trace.h

fjes: fix format string for trace output

2016-10-17 13:07:52 -04:00

fjes.h

fjes: Add debugfs entry for EP status information in fjes driver

2016-10-14 12:04:58 -04:00

Makefile

fjes: Add debugfs entry for EP status information in fjes driver

2016-10-14 12:04:58 -04:00