Merge branch 'w5100-small-changes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 16 May 2016 17:55:49 +0000 (13:55 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 16 May 2016 17:55:49 +0000 (13:55 -0400)
commit14d7e48751925b4d48f0fd2317b0570fd243f6fd
tree8175848962e7b2aa6887a6f1a89a9acc7a1460f4
parentb0456b24ff4c8f408feaf97ea465897672bb1ac1
parentc3875ca7d9f9ad135debc78e211ea062ac48323c
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>