Merge branch 'for-4.2-misc' into k.o/for-4.2
authorDoug Ledford <dledford@redhat.com>
Tue, 2 Jun 2015 13:33:22 +0000 (09:33 -0400)
committerDoug Ledford <dledford@redhat.com>
Tue, 2 Jun 2015 13:33:22 +0000 (09:33 -0400)
commitb806ef3bbed39c95b45343bf0fd78802142f6017
treeeab4e67bef332c78c25d95e00b2d6ce3241f1aee
parent73cdaaeed10d91441cb946200b5dbbbeb143bace
parent1156256811e42908fd13c4cfcf32965d8b93f2a8
Merge branch 'for-4.2-misc' into k.o/for-4.2
drivers/infiniband/core/cma.c
drivers/infiniband/hw/mlx4/main.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
net/rds/ib_send.c
net/rds/rds.h