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
..
core	IB/uverbs: Prevent integer overflow in ib_umem_get address arithmetic	2015-04-02 09:53:59 -07:00
hw	net/mlx5_core: Extend struct mlx5_interface to support multiple protocols	2015-04-02 16:33:43 -04:00
ulp	infiniband/ipoib: implement ndo_get_iflink	2015-04-02 14:05:01 -04:00
Kconfig	IB/core: Implement support for MMU notifiers regarding on demand paging regions	2014-12-15 18:13:36 -08:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00