Merge branch 'next/fixes-non-critical' into for-next

* next/fixes-non-critical:
  arm: mvebu: fix length of Ethernet registers area in .dtsi
  arm: mvebu: fix length of SATA registers area in .dtsi

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 5c471f4844d67e6e44f117cb67146e4d0772e0a1,0000000000000000000000000000000000000000..542f6129effb4cb71a01597f1a30c80e94cd2bce
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,26 -1,0 +1,30 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
++next/fixes-non-critical
++      mvebu/fixes-non-critical
++              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
++
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      machdesc/cleanup
 +              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +