From: David S. Miller <davem@davemloft.net>
Date: Mon, 16 May 2016 17:55:49 +0000 (-0400)
Subject: Merge branch 'w5100-small-changes'
X-Git-Tag: v4.7-rc1~154^2~34
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=14d7e48751925b4d48f0fd2317b0570fd243f6fd;p=linux-block.git

Merge branch 'w5100-small-changes'

Akinobu Mita says:

====================
net: w5100: collection of small changes

This patch series is the collection of relatively small changes for
w5100 driver which includes a cleanup with no functional change,
two fixes, and adding a functionality.

* Changes from v1
- Remove the watchdong_timeo assignment to set default tx timeout,
  suggested by David Miller.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

14d7e48751925b4d48f0fd2317b0570fd243f6fd