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-09 11:35:48 +03:00
2015-03-16 21:55:35 +01:00
2011-10-29 21:20:22 +02:00
2014-04-30 19:49:37 +01:00
2012-10-06 03:04:57 +09:00
2014-08-06 18:01:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-12 18:54:15 -08:00
2014-05-05 09:09:14 +02:00
2015-02-17 22:22:17 -05:00
2015-02-17 14:34:53 -08:00
2014-08-08 15:57:25 -07:00
2015-02-12 18:54:15 -08:00
2015-02-17 22:22:17 -05:00
2015-02-12 18:54:15 -08:00
2012-07-30 17:25:16 -07:00
2014-06-25 17:45:43 -07:00
2015-01-21 16:28:49 +10:30
2015-02-12 18:54:16 -08:00
2015-03-23 22:12:08 -04:00
2015-02-12 18:54:16 -08:00
2015-02-13 21:21:41 -08:00
2013-04-29 18:28:42 -07:00