Merge tag 'fixes-non-3.12-2' of git://git.infradead.org/linux-mvebu into next/fixes...
authorOlof Johansson <olof@lixom.net>
Fri, 16 Aug 2013 06:08:24 +0000 (23:08 -0700)
committerKevin Hilman <khilman@linaro.org>
Mon, 19 Aug 2013 15:47:13 +0000 (08:47 -0700)
commita3e008d1b5e39abe81e233bde623604841ff9a73
tree9b7e0cb2002fc6b6c7dfc5afdc81cb056e44ecaa
parent4319f78f422eb391bd7d63ccedbb8a2b1ab059df
parent35faad2a1563b3d4dc983a82ac41033fe053870c
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