Merge branch 'siocghwtstamp' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh...

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>

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/neterion/vxge/vxge-main.c
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
Simple merge

diff --cc net/socket.c
Simple merge