Skip to content
Commit 42872c7a authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'misc' and 'mlx4' into for-next 

Conflicts:
	drivers/infiniband/hw/mlx4/main.c
	drivers/net/ethernet/mellanox/mlx4/main.c
	include/linux/mlx4/device.h
parents d927d505 db5a7a65
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment