]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'infiniband/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 02:01:40 +0000 (12:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Sep 2012 02:01:40 +0000 (12:01 +1000)
commitffed5be82d703ac73ac865b658495e64200b6899
tree92d79cb9cea0a695be047434ef5bd6c45a2047ec
parent7dda1c4fedab27d9202d27f7253665d96be7dceb
parent09ef9fd569992c56aacb8c2ee08576bc69a8590f
Merge remote-tracking branch 'infiniband/for-next'
drivers/infiniband/core/ucma.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/mellanox/mlx4/mlx4.h
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
include/linux/mlx4/device.h