git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6226cf1)
ARM: mvebu: sort DT nodes by address
authorJason Cooper <jason@lakedaemon.net>
Thu, 12 Dec 2013 13:59:17 +0000 (13:59 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 12 Dec 2013 15:00:44 +0000 (15:00 +0000)
Prevent future unnecessary merge conflicts

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
arch/arm/boot/dts/armada-370-xp.dtsi patch | blob | history
arch/arm/boot/dts/armada-370.dtsi patch | blob | history
arch/arm/boot/dts/armada-xp.dtsi patch | blob | history

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
Simple merge
diff --cc arch/arm/boot/dts/armada-370.dtsi
Simple merge
diff --cc arch/arm/boot/dts/armada-xp.dtsi
Simple merge
Pandora Kernel Repository