]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'ocrdma', 'qib...
authorRoland Dreier <roland@purestorage.com>
Sun, 23 Sep 2012 16:34:47 +0000 (09:34 -0700)
committerRoland Dreier <roland@purestorage.com>
Sun, 23 Sep 2012 16:34:47 +0000 (09:34 -0700)
commit09ef9fd569992c56aacb8c2ee08576bc69a8590f
tree502b5e74f4875af87e56860ca71e563a7e2eddaa
parent45a60df0b1f8afcb57f95941be17a91674d5d9a5
parent74f918a806bdf5d0cc552bacaa14b6129cdc81b9
parentc807a9922efff852754218a0d6d15709fce676bb
parentc1163dd5bc740b69541bc2b21075e5bc67018b4f
parentc735be473c6d18d729f44aec5c3dc82b3440667d
parent397af4470c89c13c4a277c10154d9a02a496d30d
parentae3bca90e94dbc9c906321b33f32de4a42a6cdf4
parentf4bcc4a84e8ef2297fd28527be02e50a1da16d83
parente47977ea437a99d9ec906bd0ab55520a4efd8578
Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'ocrdma', 'qib' and 'srp' into for-next
drivers/infiniband/hw/mlx4/qp.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c