Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Dec 2013 03:33:45 +0000 (22:33 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Dec 2013 03:33:45 +0000 (22:33 -0500)
Ben Hutchings says:

====================
1. Change PTP clock name to 'sfc'.
2. Complete support for hardware timestamping and PTP clock on the
SFC9100 family.
3. Various cleanups for the PTP code.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
drivers/net/ethernet/sfc/efx.c

Simple merge