From: David S. Miller <davem@davemloft.net>
Date: Wed, 11 Jun 2014 23:02:55 +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~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=902455e00720018d1dbd38327c3fd5bda6d844ee;p=pandora-kernel.git

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

Conflicts:
	net/core/rtnetlink.c
	net/core/skbuff.c

Both conflicts were very simple overlapping changes.

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

902455e00720018d1dbd38327c3fd5bda6d844ee
Reading git-diff-tree failed