Merge branch 'tstamp-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Dec 2014 01:20:55 +0000 (20:20 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Dec 2014 01:20:55 +0000 (20:20 -0500)
commitaae68bc6f69a574beceeca6d323636782c437fa6
treeb0adfab040099b369f38ebe9a19df9632f85ded8
parent8d0c4697534a739725e429ff062dea393d8860d1
parentcbd3aad5ce66f5a266a185aa37e0eb9be9ba4154
Merge branch 'tstamp-next'

Willem de Bruijn says:

====================
timestamping updates

The main goal for this patchset is to allow correlating timestamps
with the egress interface. Also introduce a warning, as discussed
previously, and update the tests to verify the new feature.
====================

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