David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/altera/altera_sgdma.c net/netlink/af_netlink.c net/sched/cls_api.c net/sched/sch_api.c The netlink conflict dealt with moving to netlink_capable() and netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations in non-init namespaces. These were simple transformations from netlink_capable to netlink_ns_capable. The Altera driver conflict was simply code removal overlapping some void pointer cast cleanups in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-12 13:19:14 -04:00
..
hyperv_net.h	hyperv: Enable sendbuf mechanism on the send path	2014-04-30 13:48:46 -04:00
Kconfig
Makefile
netvsc_drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-05-12 13:19:14 -04:00
netvsc.c	hyperv: Enable sendbuf mechanism on the send path	2014-04-30 13:48:46 -04:00
rndis_filter.c	hyperv: Simplify the send_completion variables	2014-04-23 14:48:39 -04:00