| commit | 7ed2a0d0d473482df490b7c44f875f5eefede6aa | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sat Dec 14 22:33:45 2013 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Sat Dec 14 22:33:45 2013 -0500 |
| tree | 45865c0e43164ed55880990104d7b1665953ac56 | |
| parent | f52d81dc27c3456c702e83183035142c222acdc7 [diff] | |
| parent | bbbe7149bf0bd14432373de39315505e7a133acc [diff] |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/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>