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)
commit7ed2a0d0d473482df490b7c44f875f5eefede6aa
tree45865c0e43164ed55880990104d7b1665953ac56
parentf52d81dc27c3456c702e83183035142c222acdc7
parentbbbe7149bf0bd14432373de39315505e7a133acc
Merge branch 'for-davem' of git://git./linux/kernel/git/bwh/sfc-next

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>
drivers/net/ethernet/sfc/efx.c