]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' and 'srp...
authorRoland Dreier <roland@purestorage.com>
Tue, 2 Oct 2012 14:43:59 +0000 (07:43 -0700)
committerRoland Dreier <roland@purestorage.com>
Tue, 2 Oct 2012 14:43:59 +0000 (07:43 -0700)
commit40112724dbea6f8051f136db94d998cf2739dab6
tree9579f3af31f7d76276108bd60ec9c35b2bd18a25
parentd8fe3c30b87405365b4f5dab50bc59086b86dd77
parentaff0d2b67d4f57bc6980fdd92ca121ca245d87fd
parentd6ad6da6433ee9446f6bf40f5de7f7e6a15e8ae9
parent398d18d594661239a234705d2cc61538431b2121
parent0bc06a9c8a27a82a84cf2bfa352cf190a3ccf48f
parent443b00436180cf9a6f665974ade6adfe1c6b0926
parentb0df4db1bc323a239288c70ed95269baaa790b2d
parent453cc4f28264950d6c0cd0a8b441699ad432bd23
Merge branches 'cma', 'cxgb4', 'ipoib', 'mlx4', 'mlx4-sriov', 'nes', 'qib' and 'srp' into for-linus
drivers/infiniband/hw/mlx4/qp.c
drivers/net/ethernet/mellanox/mlx4/fw.c
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c