Merge branch 'ptp-vlan'
authorDavid S. Miller <davem@davemloft.net>
Mon, 7 Jul 2014 23:57:32 +0000 (16:57 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 7 Jul 2014 23:57:32 +0000 (16:57 -0700)
Stefan Sørensen says:

====================
Add ptp vlan support

This patch series adds functionality for running ptp/ieee1588 over vlan.
====================

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

Trivial merge