Merge branch 'next/boards' into for-next

* next/boards:
  ARM: Kirkwood: Convert LSXL to restart-poweroff driver.
  ARM: Kirkwood: Make use of the QNAP Power off driver.
  ARM: Kirkwood: add DT support for Sheevaplug and Sheevaplug eSATA

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

diff --cc arch/arm/arm-soc-for-next-contents.txt
index b5dd47f5dce85270f6ff096c2b23426f339bc54e,0000000000000000000000000000000000000000..4bd2a336bd7c700d64e038c54a79dd45211fd274
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,37 -1,0 +1,43 @@@
 +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
 +      mvebu/cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +
 +next/soc
 +      mvebu/soc
 +              git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +
++next/boards
++      mvebu/boards
++                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
++
++
 +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
 +
 +

diff --cc arch/arm/mach-kirkwood/board-dt.c
Simple merge

diff --cc arch/arm/mach-kirkwood/common.h
Simple merge