Merge branches 'misc-4.7-2', 'ipoib' and 'ib-router' into k.o/for-4.7
authorDoug Ledford <dledford@redhat.com>
Thu, 26 May 2016 15:55:19 +0000 (11:55 -0400)
committerDoug Ledford <dledford@redhat.com>
Thu, 26 May 2016 15:55:19 +0000 (11:55 -0400)
1  2  3 
drivers/infiniband/core/sa_query.c

Simple merge