From: David S. Miller <davem@davemloft.net>
Date: Mon, 6 Jan 2014 22:37:45 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.14-rc1~94^2~266
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56a4342dfe3145cd66f766adccb28fd9b571606d;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

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

56a4342dfe3145cd66f766adccb28fd9b571606d
Reading git-diff-tree failed