From: David S. Miller <davem@davemloft.net>
Date: Wed, 4 Jun 2014 06:32:12 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~36^2~78
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c99f7abf0e69987e4add567e155e042cb1f2a20b;p=pandora-kernel.git

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

Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

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

c99f7abf0e69987e4add567e155e042cb1f2a20b
Reading git-diff-tree failed