Files
kernel_arpi/include/linux
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-02-19 13:31:40 +03:00
2015-04-02 16:25:04 -04:00
2015-03-29 13:26:54 -07:00
2015-03-11 15:56:59 -07:00
2015-02-12 18:54:15 -08:00
2015-03-02 16:43:41 -05:00
2015-02-13 21:21:36 -08:00
2015-02-17 14:34:51 -08:00
2015-02-11 17:06:02 -08:00
2015-03-11 17:56:28 -04:00
2015-02-17 14:34:52 -08:00
2015-02-16 17:56:03 -08:00
2015-02-13 21:21:41 -08:00
2015-03-11 21:55:28 -04:00
2015-02-13 21:21:35 -08:00
2015-02-17 22:21:11 -05:00