Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into...
authorDoug Ledford <dledford@redhat.com>
Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)
1  2  3  4  5  6 
drivers/infiniband/hw/mlx4/qp.c

Simple merge