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
..
2013-09-26 15:13:38 -04:00
2013-08-28 13:58:27 -04:00
2013-08-28 13:58:27 -04:00
2013-08-26 14:09:06 -04:00
2013-09-26 15:13:46 -04:00
2013-01-11 14:12:01 -05:00
2013-06-24 14:44:23 -04:00
2013-08-09 15:57:53 -04:00
2013-09-26 15:13:47 -04:00
2013-09-26 15:13:47 -04:00
2013-09-26 14:02:29 -04:00
2013-08-22 14:30:29 -04:00
2013-09-26 15:13:48 -04:00
2013-06-03 15:55:46 -04:00