Merge branch 'siocghwtstamp' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh...
authorDavid S. Miller <davem@davemloft.net>
Fri, 6 Dec 2013 00:45:14 +0000 (19:45 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 6 Dec 2013 00:45:14 +0000 (19:45 -0500)
commit426e1fa31e0d8e982891e801c80b84b74f209f10
treebc53409418ffa918fb3f175639bc5c9245c4219f
parente1ca87bb1b64b044163e686ff3bb71405156c561
parenta4bcc795e9cc84902b86edbfbb755ecb38d11f91
Merge branch 'siocghwtstamp' of git://git./linux/kernel/git/bwh/sfc-next

Ben Hutchings says:

====================
SIOCGHWTSTAMP ioctl

1. Add the SIOCGHWTSTAMP ioctl and update the timestamping
documentation.
2. Implement SIOCGHWTSTAMP in most drivers that support SIOCSHWTSTAMP.
3. Add a test program to exercise SIOC{G,S}HWTSTAMP.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/neterion/vxge/vxge-main.c
drivers/net/ethernet/sfc/efx.c
drivers/net/ethernet/ti/cpsw.c
net/socket.c