Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' and 'srp...
Roland Dreier [Tue, 2 Oct 2012 14:43:59 +0000 (07:43 -0700)]
1  2  3  4  5  6  7  8 
drivers/infiniband/hw/mlx4/qp.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

Simple merge