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)
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>
1  2 
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

Simple merge
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge