Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3e008d1 authored by Olof Johansson's avatar Olof Johansson Committed by Kevin Hilman
Browse files

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
parents 4319f78f 35faad2a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -9,5 +9,5 @@
	#size-cells = <2>;
	chosen { };
	aliases { };
	memory { device_type = "memory"; reg = <0 0>; };
	memory { device_type = "memory"; reg = <0 0 0 0>; };
};