Merge tag 'fixes-non-3.12-2' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical

From Jason Cooper, mvebu fixes-non-critical for v3.12 (round 2):

 - fix the memory node (2 by 2) in skeleton64.dtsi

* tag 'fixes-non-3.12-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: Fix memory node in skeleton64.dtsi