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)
commit6be842f7ccc2c690232f5094681eb0efae4c1590
tree130d1c049e345443cfd8048971fa7cdce28ed04f
parent62d2b157f4a1f354fe8d28db5b4891cdafe1a9c5
parent90683061dd50b0d70f01466c2d694f4e928a86f3
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>