From: Roland Dreier <rolandd@cisco.com>
Date: Tue, 19 Aug 2008 22:01:45 +0000 (-0700)
Subject: Merge branches 'ipath' and 'ipoib' into for-linus
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~15633^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=45dd75d83cef8c4e4a8d78bc8ed072a01196d30c;p=mirror_ubuntu-zesty-kernel.git

Merge branches 'ipath' and 'ipoib' into for-linus
---

45dd75d83cef8c4e4a8d78bc8ed072a01196d30c