Merge branch 'sh_eth-fixes'
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Oct 2015 01:32:22 +0000 (18:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Oct 2015 01:32:22 +0000 (18:32 -0700)
Sergei Shtylyov says:

====================
sh_eth: RX buffer alignment fixes

Here's a set of 2 patches against DaveM's 'net.git' repo which are the
fixes to the RX buffer size calculation.

[1/2] sh_eth: fix RX buffer size alignment
[2/2] sh_eth: fix RX buffer size calculation
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge