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)
1  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

Simple merge
Simple merge
Simple merge
diff --cc net/rds/rds.h
Simple merge