From: David S. Miller Date: Wed, 4 Mar 2015 20:40:59 +0000 (-0500) Subject: Merge branch 'sh_eth-next' X-Git-Tag: firefly_0821_release~176^2~1974^2~349 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4f075a58c1a0e2891acafad0180458bd7a042843;p=firefly-linux-kernel-4.4.55.git 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 --- 4f075a58c1a0e2891acafad0180458bd7a042843