projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27db730 4398f9c)
Merge branch 'sh_eth-next'
authorDavid S. Miller <davem@davemloft.net>
Wed, 4 Mar 2015 20:40:59 +0000 (15:40 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Mar 2015 20:40:59 +0000 (15:40 -0500)
commit4f075a58c1a0e2891acafad0180458bd7a042843
tree9d96b086dfaacd00f69528cfa57d54acdf01cf2btree | snapshot
parent27db730c4f5ed524235b06523f2dae4961d3aa98commit | diff
parent4398f9c817028b3b654923b3b614ea174cbc2c67commit | 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>
John Crispins staging tree