Merge branch 'mlx4-time-stamping-fixes'
authorDavid S. Miller <davem@davemloft.net>
Fri, 18 Dec 2015 19:48:04 +0000 (14:48 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Dec 2015 19:48:04 +0000 (14:48 -0500)
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>

Trivial merge