From: Doug Ledford <dledford@redhat.com>
Date: Thu, 12 May 2016 18:21:02 +0000 (-0400)
Subject: Merge branches 'mlx5-1' and 'srp-1' into k.o/for-4.7
X-Git-Tag: v6.1~16448^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=321aebb880d2bfdf9cff503f57207e930aee6b1d;p=sdk%2Femulator%2Femulator-kernel.git

Merge branches 'mlx5-1' and 'srp-1' into k.o/for-4.7
---

321aebb880d2bfdf9cff503f57207e930aee6b1d