1
0
Files
linux/include/linux
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-28 15:42:49 -04:00
2013-09-13 15:09:52 +02:00
2013-09-11 15:59:42 -07:00
2013-10-03 15:33:35 -04:00
2013-09-13 15:09:52 +02:00
2013-09-13 15:09:52 +02:00
2013-09-13 15:09:52 +02:00
2013-09-08 20:20:23 -04:00
2013-09-24 21:12:32 -05:00
2013-09-09 14:29:15 -07:00
2013-09-10 18:56:32 -04:00
2013-09-04 23:11:42 +03:00
2013-09-12 15:38:02 -07:00