Merge branches 'ib_core', 'ib_ipoib', 'srpt', 'drain-cq-v4' and 'net/9p' into k.o...
authorDoug Ledford <dledford@redhat.com>
Mon, 14 Mar 2016 21:42:57 +0000 (17:42 -0400)
committerDoug Ledford <dledford@redhat.com>
Mon, 14 Mar 2016 21:42:57 +0000 (17:42 -0400)

Trivial merge