From: David S. Miller <davem@davemloft.net>
Date: Wed, 26 Mar 2014 00:29:20 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.15-rc1~113^2~92
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04f58c88542b6b351efb4eea01134eb672e22e6e;p=pandora-kernel.git

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

Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

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

04f58c88542b6b351efb4eea01134eb672e22e6e
Reading git-diff-tree failed