Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into...

author Doug Ledford <dledford@redhat.com>

Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)

committer Doug Ledford <dledford@redhat.com>

Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)
author Doug Ledford <dledford@redhat.com>
Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)
committer Doug Ledford <dledford@redhat.com>
Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)
diff --cc drivers/infiniband/hw/mlx4/qp.c
Simple merge
author	Doug Ledford <dledford@redhat.com>
	Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)
committer	Doug Ledford <dledford@redhat.com>
	Wed, 15 Apr 2015 20:24:49 +0000 (16:24 -0400)