From: Doug Ledford <dledford@redhat.com>
Date: Wed, 16 Mar 2016 17:38:28 +0000 (-0400)
Subject: Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d2ad9cc75963714d04d4596c226a499765950dbf;p=deliverable%2Flinux.git

Merge branches 'mlx4', 'mlx5' and 'ocrdma' into k.o/for-4.6
---

d2ad9cc75963714d04d4596c226a499765950dbf