]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'infiniband/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 01:20:41 +0000 (11:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 01:20:41 +0000 (11:20 +1000)
commit2555ee5f1960849186a5c110b174309be75b7e1e
tree856a3063a334bf20742ad9f54735d434c7500737
parenteeba9fd5a2e4bee664d5c0e8cf6e7c9cbcf22973
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