David S. Miller c85d6975ef
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Conflicts:
drivers/net/ethernet/mellanox/mlx4/cmd.c
net/core/fib_rules.c
net/ipv4/fib_frontend.c
The fib_rules.c and fib_frontend.c conflicts were locking adjustments
in 'net' overlapping addition and removal of code in 'net-next'.
The mlx4 conflict was a bug fix in 'net' happening in the same
place a constant was being replaced with a more suitable macro.
Signed-off-by: David S. Miller <davem@davemloft.net >
2015-04-06 22:34:15 -04:00
2014-10-20 10:30:15 +08:00
2015-04-01 11:28:22 +02:00
2014-09-23 23:15:46 -07:00
2015-03-06 01:21:21 +01:00
2014-08-20 15:13:08 +02:00
2014-06-25 19:28:43 +02:00
2014-06-25 19:28:43 +02:00
2015-03-30 16:05:26 -04:00
2014-10-14 13:08:29 +11:00
2014-02-27 13:51:29 +09:00
2015-03-20 19:10:44 -04:00
2015-01-27 09:34:59 -06:00
2014-12-23 12:09:58 -02:00
2014-12-19 12:57:45 -08:00
2014-10-14 16:06:45 -04:00
2015-04-06 16:42:35 -04:00
2014-07-01 10:48:05 -06:00
2015-02-02 19:25:51 -08:00
2014-05-19 09:38:24 +02:00
2014-04-22 21:42:27 -04:00
2014-03-20 14:55:18 +01:00
2015-03-06 21:50:02 -05:00
2014-11-19 14:48:02 -06:00
2015-02-09 13:06:47 -05:00
2014-01-21 23:46:27 -05:00
2014-01-23 16:36:55 -08:00
2014-12-08 12:55:57 +08:00
2014-11-28 10:19:49 +00:00
2014-08-05 16:35:54 -07:00
2015-02-09 14:07:54 -08:00
2014-03-13 19:07:42 +11:00
2014-08-08 15:57:31 -07:00
2014-01-17 11:12:06 +01:00
2015-03-24 15:25:15 -04:00
2015-02-11 15:12:13 -08:00
2015-02-05 02:45:00 -05:00
2014-07-22 16:37:43 +02:00
2014-05-14 10:04:34 +01:00
2014-11-07 10:21:44 -08:00
2014-07-09 16:41:36 -07:00
2015-03-23 22:12:09 -04:00
2014-12-05 23:56:55 +08:00
2015-01-12 16:47:04 -05:00
2014-08-27 22:59:39 -07:00
2014-04-27 19:08:06 -04:00
2015-03-23 22:12:08 -04:00
2015-03-23 22:01:28 -04:00
2014-12-16 11:19:42 -05:00
2014-11-05 16:30:03 -05:00
2014-02-27 15:59:09 -05:00
2014-12-22 16:12:36 -05:00
2015-01-05 22:44:46 -05:00
2014-09-29 00:13:10 -04:00
2015-04-03 14:58:48 -07:00
2015-02-09 16:59:03 +09:00
2015-03-23 22:12:08 -04:00
2015-02-17 16:29:36 +01:00
2014-12-02 13:52:53 -07:00
2015-02-11 17:06:00 -08:00
2015-02-17 14:34:51 -08:00
2015-01-06 19:44:36 +02:00
2014-05-30 21:01:11 +02:00
2015-01-23 14:33:36 +01:00
2014-12-31 14:17:20 -05:00
2015-01-08 19:29:11 -08:00
2014-12-10 21:30:20 -05:00
2014-11-14 17:47:47 -02:00
2014-08-08 15:57:31 -07:00
2015-02-12 18:54:08 -08:00
2014-02-07 15:30:34 -08:00
2014-03-04 13:51:06 -05:00
2014-01-20 14:45:33 -08:00
2015-01-20 13:51:06 +01:00
2014-12-13 12:42:52 -08:00
2015-03-20 21:47:40 -04:00
2015-01-19 14:21:18 -05:00
2015-02-02 18:46:51 -08:00
2014-07-15 16:12:01 -07:00
2015-02-02 21:50:40 +01:00
2014-01-23 16:36:55 -08:00
2015-03-30 10:25:35 +02:00
2015-02-19 16:15:35 -07:00
2015-02-07 22:40:17 -08:00
2015-01-27 08:14:26 -06:00
2014-11-16 11:41:57 +01:00
2014-02-17 07:18:19 +01:00
2015-03-01 14:05:19 -05:00
2015-02-04 22:15:45 -08:00
2014-01-23 16:36:55 -08:00
2015-02-12 12:30:29 +01:00
2014-04-30 04:18:57 -07:00
2014-03-21 14:21:13 -04:00
2015-01-21 19:21:30 +01:00
2014-08-05 16:41:22 -04:00
2014-01-20 14:44:17 -08:00
2015-03-11 23:28:09 -04:00
2014-11-16 10:58:53 +01:00
2014-07-16 14:40:04 -07:00
2014-07-18 12:13:40 -07:00
2014-12-13 12:42:52 -08:00
2015-02-07 18:43:16 +08:00
2015-01-09 14:33:04 -08:00
2015-03-07 03:39:55 +01:00
2014-07-20 14:33:23 -07:00
2014-06-06 16:08:14 -07:00
2014-08-21 15:25:11 -05:00
2015-02-08 01:03:12 -08:00
2014-12-10 17:41:10 -08:00
2014-12-18 11:07:27 -08:00
2014-02-26 17:08:40 -05:00
2014-02-14 16:09:43 -05:00
2014-12-09 14:10:41 +08:00
2014-01-20 14:44:05 -08:00
2015-02-09 13:20:47 -08:00
2015-03-05 22:08:42 -05:00
2014-04-26 12:13:24 -04:00
2014-11-06 15:01:03 -08:00
2014-05-23 16:28:53 -04:00
2014-08-25 03:28:08 -05:00
2015-01-11 16:27:25 -08:00
2015-01-31 09:05:06 -08:00
2014-08-25 10:40:06 -07:00
2014-12-04 12:37:01 -02:00
2015-02-02 11:51:38 -02:00
2014-10-24 08:58:09 -02:00
2014-12-16 23:21:36 -02:00
2014-11-14 17:51:18 -02:00
2015-02-10 12:38:14 -07:00
2014-12-23 10:57:09 -02:00
2015-01-21 16:28:56 +10:30
2015-03-10 11:48:29 +10:30
2015-02-11 15:03:16 +10:30
2014-12-09 12:06:32 +02:00
2015-02-17 16:19:27 +10:30
2015-02-11 15:03:15 +10:30
2014-12-29 10:54:54 +02:00
2015-03-13 15:55:43 +10:30
2014-12-09 12:05:24 +02:00
2014-11-05 20:18:30 -08:00
2014-10-02 14:23:14 -04:00
2014-08-29 16:28:16 -07:00
2015-03-31 13:58:35 -04:00
c85d6975ef