From: David S. Miller <davem@davemloft.net>
Date: Fri, 18 Dec 2015 19:48:04 +0000 (-0500)
Subject: Merge branch 'mlx4-time-stamping-fixes'
X-Git-Tag: firefly_0821_release~176^2~505^2~27
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6be842f7ccc2c690232f5094681eb0efae4c1590;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mlx4-time-stamping-fixes'

Or Gerlitz says:

====================
Mellanox mlx4 driver fixes

Two small fixes from Jenny for code flows that deal with time-stamping.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

6be842f7ccc2c690232f5094681eb0efae4c1590