]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'infiniband/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:55:28 +0000 (12:55 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:55:28 +0000 (12:55 +1100)
commit383dd208736079690c1d6e9b7054ed0d21a5acc2
treeb4e2bd6e064e313ca07f643c8ea6f07ebef406a7
parent12857782386013c99f4056e59e8f5f1c7c1c1064
parent10e32f8f22ae66fc9adf69c9bd6559836d82d135
Merge remote-tracking branch 'infiniband/for-next'

Conflicts:
include/linux/mlx4/device.h
MAINTAINERS
drivers/infiniband/core/cma.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/mcg.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/port.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
include/linux/mlx4/cmd.h
include/linux/mlx4/cq.h
include/linux/mlx4/device.h