David S. Miller 182ad468e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

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

2015-08-13 16:23:11 -07:00

..

common.h

xen-netback: remove duplicated function definition

2015-07-08 14:12:53 -07:00

interface.c

xen/netback: Wake dealloc thread after completing zerocopy work

2015-08-06 23:42:48 -07:00

Makefile

…

netback.c

xen/netback: Wake dealloc thread after completing zerocopy work

2015-08-06 23:42:48 -07:00

xenbus.c

xen-netback: fix a BUG() during initialization

2015-06-23 03:34:02 -07:00