git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Thu, 5 Jun 2014 23:22:02 +0000 (16:22 -0700)
committer	David S. Miller <davem@davemloft.net>
	Thu, 5 Jun 2014 23:22:02 +0000 (16:22 -0700)
commit	bb45d8a3ea128501540385605c8a52874a8e602c
tree	23f929c890219d6ef412b4ff630adf501b70a3ec	tree \| snapshot
parent	f384f0e0c9696bd4c7d33f7b2bf53cc2b249aee8	commit \| diff
parent	aff15ff4e5219feb601c285d96fb7df9150b164c	commit \| diff

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>

Linux Kernel Source Tree.

RSS Atom

drivers/net/ethernet/freescale/gianfar.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history