summaryrefslogtreecommitdiff
path: root/ethtool.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2012-09-06 19:03:24 +0100
committerBen Hutchings <bhutchings@solarflare.com>2012-09-06 19:03:24 +0100
commite78cb19ee551be375b6c0078aee9bc922fbd9f3e (patch)
tree867752d96e22ce38c38ac2429a0e4bcc27a8ae86 /ethtool.c
parent2d1a01a8f293422326897d300e2737bdd7802469 (diff)
parentf2bab48e3e5cd3c6bf2e316bf126fa37b6ff4aa6 (diff)
downloadethtool-e78cb19ee551be375b6c0078aee9bc922fbd9f3e.tar.gz
Merge commit 'v3.5'
I tagged v3.5 and pushed out master in the middle of rebasing master to add the last fix for 3.5. Conflicts: NEWS
Diffstat (limited to 'ethtool.c')
0 files changed, 0 insertions, 0 deletions