tree cb497deea01827951809c9c7c0f1c22780c146be
parent 60302ff631f0f3eac0ec592e128b776f0676b397
parent f22e6e847115abc3a0e2ad7bb18d243d42275af1
author David S. Miller <davem@davemloft.net> 1428371539 -0400
committer David S. Miller <davem@davemloft.net> 1428374055 -0400

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>