From: Doug Ledford <dledford@redhat.com>
Date: Thu, 26 May 2016 15:55:19 +0000 (-0400)
Subject: Merge branches 'misc-4.7-2', 'ipoib' and 'ib-router' into k.o/for-4.7
X-Git-Tag: v4.7-rc1~13^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e6f61130ed7a124138c4f7b1bd35e24e8113cb83;p=linux.git

Merge branches 'misc-4.7-2', 'ipoib' and 'ib-router' into k.o/for-4.7
---

e6f61130ed7a124138c4f7b1bd35e24e8113cb83