]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
projects / users / willy / pagecache.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f52d81d bbbe714)
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 patch | diff1 | diff2 | blob | history

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.