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-24 10:33:07 -04:00
2013-09-16 16:10:26 -04:00
2013-09-18 12:16:08 -07:00
2013-09-22 11:43:38 +01:00
2013-09-18 10:58:23 +01:00
2013-09-28 14:22:17 -07:00
2013-09-24 11:15:05 -07:00
2013-09-09 15:24:47 +01:00
2013-09-09 16:35:29 -07:00
2013-08-20 10:51:39 -07:00
2013-09-06 13:30:06 -07:00
2013-09-06 13:34:43 -07:00
2013-08-25 17:11:02 +01:00
2013-09-12 13:59:31 -07:00
2013-09-09 16:35:29 -07:00
2013-08-25 17:11:02 +01:00
2013-08-25 17:11:02 +01:00
2013-09-09 16:35:29 -07:00
2013-09-20 15:17:14 -07:00
2013-08-25 17:11:06 +01:00
2013-08-25 17:11:02 +01:00
2013-08-25 17:11:02 +01:00
2013-08-25 17:11:02 +01:00
2013-08-25 17:11:02 +01:00
2013-08-29 19:12:04 -07:00
2013-09-06 13:34:43 -07:00
2013-08-29 12:33:52 -07:00
2013-08-25 17:11:02 +01:00
2013-09-09 16:35:29 -07:00
2013-09-06 13:21:16 -07:00
2013-09-06 13:30:06 -07:00
2013-09-16 16:10:26 -04:00
2013-09-18 12:02:01 -07:00
2013-09-06 13:34:43 -07:00
2013-09-06 13:30:06 -07:00
2013-09-06 13:26:27 -07:00
2013-09-06 13:21:16 -07:00
2013-08-25 17:11:02 +01:00
2013-08-29 12:33:52 -07:00
2013-09-18 08:20:27 -07:00
2013-09-19 03:53:44 +02:00
2013-09-06 13:21:16 -07:00
2013-09-06 13:30:06 -07:00
2013-09-18 08:16:46 -07:00
2013-09-17 09:08:13 -07:00
2013-09-09 17:31:04 -07:00
2013-09-09 17:38:20 -07:00
2013-08-20 15:05:31 -07:00
2013-09-12 15:38:01 -07:00
2013-10-07 15:16:45 -04:00
2013-09-06 13:30:06 -07:00
2013-09-09 17:14:09 -07:00
2013-09-06 13:21:16 -07:00
2013-09-09 12:05:37 -04:00
2013-09-22 11:08:50 +01:00
2013-09-06 13:21:16 -07:00
53af53ae83