linux/drivers/net/hyperv
David S. Miller f24001941c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Fix merge between commit 3adadc08cc ("net ax25: Reorder ax25_exit to
remove races") and commit 0ca7a4c87d ("net ax25: Simplify and
cleanup the ax25 sysctl handling")

The former moved around the sysctl register/unregister calls, the
later simply removed them.

With help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-23 23:15:17 -04:00
..
hyperv_net.h net/hyperv: Add support for vlan trunking from guests 2012-03-12 17:06:48 -07: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 2012-04-23 23:15:17 -04:00
netvsc.c net/hyperv: Add flow control based on hi/low watermark 2012-04-03 17:47:15 -04:00
rndis_filter.c net/hyperv: Add support for vlan trunking from guests 2012-03-12 17:06:48 -07:00