commit | 4f075a58c1a0e2891acafad0180458bd7a042843 | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Wed Mar 04 15:40:59 2015 -0500 |
committer | David S. Miller <davem@davemloft.net> | Wed Mar 04 15:40:59 2015 -0500 |
tree | 9d96b086dfaacd00f69528cfa57d54acdf01cf2b | |
parent | 27db730c4f5ed524235b06523f2dae4961d3aa98 [diff] | |
parent | 4398f9c817028b3b654923b3b614ea174cbc2c67 [diff] |
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>