Files
linux/include/net
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-09-18 10:54:36 +02:00
2015-03-04 00:23:23 -05:00
2015-03-06 21:50:02 -05:00
2013-11-07 19:28:58 -05:00
2015-03-12 14:39:40 -04:00
2014-09-30 01:02:26 -04:00
2015-03-12 14:39:40 -04:00
2014-06-04 22:46:38 -07:00
2015-01-18 01:56:32 -05:00
2015-03-17 22:02:29 -04:00
2015-03-11 16:22:14 -04:00
2015-03-12 14:39:40 -04:00
2014-01-03 20:56:48 -05:00
2015-03-12 14:39:40 -04:00
2015-01-15 18:26:16 -05:00
2014-06-02 11:00:41 -07:00
2015-03-12 22:58:12 -04:00
2014-05-22 14:57:15 -04:00
2015-03-31 13:58:35 -04:00