Skip to content
Commit 4f075a58 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sh_eth-next'



Ben Hutchings says:

====================
sh_eth changes for net-next

Some minor new features and fixes.

These depend in part on the series I sent earlier for net, specifically
"sh_eth: WARN on access to a register not implemented in a particular
chip" depends on "sh_eth: Fix RX recovery on R-Car in case of RX ring
underrun".
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 27db730c 4398f9c8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment