Learn more about cloning repositories
You have read-only access
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
