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

Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

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

2015-12-17 22:08:28 -05:00

..

common_hsi.h

qed: fix handling of concurrent ramrods.

2015-12-07 14:14:03 -05:00

eth_common.h

…

qed_chain.h

…

qed_eth_if.h

…

qed_if.h

…