[ethtool] 16/24: Merge tag 'v4.2' into debian

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository ethtool.

commit 7a2041d6b46c7d6a915d71d921bc5877f4c0aedd
Merge: 530e446 5af504b
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Oct 9 03:53:43 2015 +0100

    Merge tag 'v4.2' into debian
    
    Release version 4.2.

 Makefile.am    |   2 +-
 NEWS           |  22 +++++++
 configure.ac   |   2 +-
 ethtool-copy.h |  61 ++++++++++++++++--
 ethtool.8.in   |   2 +-
 ethtool.c      |  39 ++++++------
 ibm_emac.c     | 161 +++++++++++++++++++++++++++++++++++-----------
 internal.h     |  16 +++--
 sfpdiag.c      |   2 +-
 sfpid.c        |  43 ++++++++++++-
 vmxnet3.c      | 198 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 476 insertions(+), 72 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/ethtool.git