From: David S. Miller <davem@davemloft.net>
Date: Wed, 9 Oct 2013 03:07:53 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v3.13-rc1~105^2~209
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53af53ae83fe960ceb9ef74cac7915e9088f4266;p=pandora-kernel.git

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

Conflicts:
	include/linux/netdevice.h
	net/core/sock.c

Trivial merge issues.

Removal of "extern" for functions declaration in netdevice.h
at the same time "const" was added to an argument.

Two parallel line additions in net/core/sock.c

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

53af53ae83fe960ceb9ef74cac7915e9088f4266
Reading git-diff-tree failed