From: David S. Miller <davem@davemloft.net>
Date: Sun, 2 Feb 2014 00:57:05 +0000 (-0800)
Subject: Merge branch 'ethoc'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e95c3edaaa4547387b36fbe13f27fa8cd788ebbc;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'ethoc'

Max Filippov says:

====================
OpenCores 10/100 MAC ethtool operations

this series implements ethtool callbacks for the ethoc driver as was
requested by Florian.

Changes v1->v2:
- fix {get,set}_settings return code in case there's no PHY;
- fix set_ringparam: check ring sizes, change ring sizes on the fly.
====================

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

e95c3edaaa4547387b36fbe13f27fa8cd788ebbc