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

Conflicts:
	drivers/net/xen-netback/netback.c
	net/core/filter.c

A filter bug fix overlapped some cleanups and a conversion
over to some new insn generation macros.

A xen-netback bug fix overlapped the addition of multi-queue
support.

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

2014-06-05 16:22:02 -07:00

..

common.h

xen-netback: Add support for multiple queues

2014-06-04 14:48:16 -07:00

interface.c

xen-netback: Add support for multiple queues

2014-06-04 14:48:16 -07:00

Makefile

…

netback.c

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

2014-06-05 16:22:02 -07:00

xenbus.c

xen-netback: Add support for multiple queues

2014-06-04 14:48:16 -07:00