From: Olof Johansson <olof@lixom.net>
Date: Sat, 1 Jun 2013 05:27:34 +0000 (-0700)
Subject: Merge branch 'next/fixes-non-critical' into for-next
X-Git-Tag: next-20130607~15^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d1f19abb65f074cd08b3473f6c9f3a909b366408;p=karo-tx-linux.git

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>
---

d1f19abb65f074cd08b3473f6c9f3a909b366408
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 5c471f4844d6,000000000000..542f6129effb
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ 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
 +
 +