Merge tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux into...
authorOlof Johansson <olof@lixom.net>
Sat, 1 Jun 2013 05:27:01 +0000 (22:27 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 1 Jun 2013 05:27:01 +0000 (22:27 -0700)
commitb9747b3aafa7687414491e789c1a1b05c8781018
treec8cbbee93e82bfbd7620d5483acaa7d9c2f92aa6
parente4aa937ec75df0eea0bee03bffa3303ad36c986b
parentcf8088c5cac6ce20d914b9131533844b9291a054
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