[ethtool] 18/20: Merge tag 'v4.5' 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 a93fda57a30d173ddd00d58f8b3bb94fda100299
Merge: fd06f36 deb1c66
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Mar 14 11:11:47 2016 +0000

    Merge tag 'v4.5' into debian

 .gitignore      |   2 +
 NEWS            |  16 ++
 configure.ac    |   2 +-
 ethtool-copy.h  | 478 +++++++++++++++++++++++++++++++++++++++++++++++---------
 ethtool.8.in    |  54 ++++++-
 ethtool.c       | 132 +++++++++++-----
 internal.h      |  19 ++-
 marvell.c       |  21 +--
 test-common.c   |   2 +-
 test-features.c |   2 +-
 10 files changed, 590 insertions(+), 138 deletions(-)

diff --cc .gitignore
index 097af9d,f1165a2..d78da59
--- a/.gitignore
+++ b/.gitignore
@@@ -25,8 -25,5 +25,10 @@@ pus
  .dotest
  autom4te.cache
  .deps
+ test-*.log
+ test-*.trs
 +
 +.pc
 +debian/ethtool.debhelper.log
 +debian/ethtool.substvars
 +debian/files

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