diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-12-14 22:33:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-14 22:33:45 -0500 |
| commit | 7ed2a0d0d473482df490b7c44f875f5eefede6aa (patch) | |
| tree | 45865c0e43164ed55880990104d7b1665953ac56 /net/tipc/socket.c | |
| parent | ipv6: fix compiler warning in ipv6_exthdrs_len (diff) | |
| parent | sfc: Remove unnecessary condition for processing the TX timestamp queue (diff) | |
| download | linux-dev-7ed2a0d0d473482df490b7c44f875f5eefede6aa.tar.xz linux-dev-7ed2a0d0d473482df490b7c44f875f5eefede6aa.zip | |
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>
Diffstat (limited to 'net/tipc/socket.c')
0 files changed, 0 insertions, 0 deletions