David S. Miller 53af53ae83 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>
2013-10-08 23:07:53 -04:00
..
2011-01-19 23:31:12 -08:00
2011-01-19 23:31:12 -08:00
2011-01-19 23:31:12 -08:00
2011-01-19 23:31:12 -08:00
2013-06-11 02:51:03 -07:00
2012-04-01 18:11:37 -04:00
2012-04-01 18:11:37 -04:00
2012-04-01 18:11:37 -04:00
2012-04-01 18:11:37 -04:00
2012-07-12 08:33:18 -07:00
2012-04-01 18:11:37 -04:00