From: David S. Miller <davem@davemloft.net>
Date: Wed, 18 Dec 2013 21:42:06 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.14-rc1~94^2~444
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=143c9054949436cb05e468439dc5e46231f33d09;p=pandora-kernel.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/intel/i40e/i40e_main.c
	drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

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

143c9054949436cb05e468439dc5e46231f33d09
Reading git-diff-tree failed