Merge tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux...

Merge tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux

 into next/fixes-non-critical

From Jason Cooper:
mvebu fixes non-critical for v3.11 (round 1)
 - mvebu
    - fix register area length in dtsi for ethernet and sata

Signed-off-by: Olof Johansson <olof@lixom.net>

* tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: fix length of Ethernet registers area in .dtsi
  arm: mvebu: fix length of SATA registers area in .dtsi