David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

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

2016-08-18 01:17:32 -04:00

..

hyperv_net.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-08-18 01:17:32 -04:00

Kconfig

staging: hv: move hv_netvsc out of staging area

2011-11-29 16:12:36 +09:00

Makefile

staging: hv: move hv_netvsc out of staging area

2011-11-29 16:12:36 +09:00

netvsc_drv.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-08-18 01:17:32 -04:00

netvsc.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2016-08-18 01:17:32 -04:00

rndis_filter.c

hv_netvsc: Add query for initial physical link speed

2016-08-08 16:14:07 -07:00