diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-03-04 15:40:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-04 15:40:59 -0500 |
| commit | 4f075a58c1a0e2891acafad0180458bd7a042843 (patch) | |
| tree | 9d96b086dfaacd00f69528cfa57d54acdf01cf2b /drivers/net/ethernet/cadence | |
| parent | Merge branch 'basic-mpls-support' (diff) | |
| parent | sh_eth: Mitigate lost statistics updates (diff) | |
| download | linux-dev-4f075a58c1a0e2891acafad0180458bd7a042843.tar.xz linux-dev-4f075a58c1a0e2891acafad0180458bd7a042843.zip | |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cadence')
0 files changed, 0 insertions, 0 deletions