linux/drivers/net/xen-netback
David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-12-18 16:42:06 -05:00
..
common.h xen-netback: improve guest-receive-side flow control 2013-12-09 20:33:12 -05:00
interface.c xen-netback: improve guest-receive-side flow control 2013-12-09 20:33:12 -05:00
Makefile
netback.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
xenbus.c drivers/net/*: Fix FSF address in file headers 2013-12-06 12:37:55 -05:00