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
2015-03-13 16:25:50 +02:00
2015-03-22 23:50:11 +01:00
2015-03-29 19:25:57 +00:00
2015-03-17 12:19:14 +00:00
2015-04-02 16:25:04 -04:00
2015-04-02 16:33:43 -04:00
2015-03-20 09:03:46 +02:00
2015-03-31 13:58:35 -04:00
2015-04-04 13:26:52 -04:00
2015-04-04 12:47:04 -04:00
2015-04-04 12:52:06 -04:00
2015-03-18 11:42:30 +00:00
2015-03-18 17:50:25 +01:00
2015-03-31 14:15:08 -04:00
2015-03-29 12:06:45 -07:00
2015-03-29 13:26:54 -07:00
2015-03-09 23:57:54 -04:00
2015-03-11 15:56:59 -07:00
2015-03-23 16:52:26 -04:00
2015-03-24 15:25:15 -04:00
2015-03-17 12:23:19 -04:00
2015-03-14 17:11:30 +01:00
2015-03-29 13:33:22 -07:00
2015-03-18 22:05:09 -04:00
2015-03-10 13:45:28 -04:00
2015-03-23 22:12:08 -04:00
2015-04-03 12:52:29 -04:00
2015-03-12 18:46:08 -07:00
2015-03-31 09:45:50 -06:00
2015-03-19 14:14:43 -04:00
2015-03-18 10:46:39 -07:00
2015-03-12 18:46:08 -07:00
2015-04-06 22:34:15 -04:00
2015-03-22 19:45:55 +01:00
2015-04-04 12:31:38 -04:00
2015-03-11 17:56:28 -04:00
2015-03-09 23:50:20 -04:00
2015-03-13 09:45:24 -05:00
2015-04-03 15:08:20 -04:00
2015-03-31 12:01:19 -04:00
2015-03-25 17:18:33 +01:00
2015-03-25 16:20:31 -07:00
2015-03-20 21:36:53 -04:00
2015-03-07 03:39:55 +01:00
2015-03-20 18:51:09 -04:00
2015-03-11 21:55:28 -04:00
2015-03-23 16:41:36 -04:00
2015-03-17 22:01:56 -04:00
2015-03-18 22:00:34 -04:00
2015-03-12 18:46:08 -07:00
2015-03-17 12:23:32 -04:00
c85d6975ef