]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge