From: David S. Miller <davem@davemloft.net>
Date: Thu, 2 Oct 2014 18:25:43 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: fixes-against-v3.18-rc2~144^2~61
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=739e4a758e0e2930f4bcdddd244254bae8dd7499;p=pandora-kernel.git

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

Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

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

739e4a758e0e2930f4bcdddd244254bae8dd7499
Reading git-diff-tree failed