tree 0cd5309f2a931d3f210aa3d2025aae64f2276e8c
parent b343ca84b4e3ba65508503333c923a797801a588
parent 9684d7b0dab3cf3a897edd85dca501d413888d56
author David S. Miller <davem@davemloft.net> 1381288073 -0400
committer David S. Miller <davem@davemloft.net> 1381288073 -0400

Merge git://git.kernel.org/pub/scm/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>