Merge branch 'sh_eth-next'

Browse source

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: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-03-04 15:40:59 -05:00

parent 27db730c4f 4398f9c817

commit 4f075a58c1

2 changed files with 256 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

259

drivers/net/ethernet/renesas/sh_eth.c

View file

23

drivers/net/ethernet/renesas/sh_eth.h

View file