]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'at91-4.6-dt' into at91-next
authorNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 3 Mar 2016 10:57:32 +0000 (11:57 +0100)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Thu, 3 Mar 2016 10:57:32 +0000 (11:57 +0100)
1  2 
arch/arm/boot/dts/at91-sama5d2_xplained.dts
arch/arm/boot/dts/sama5d2.dtsi

Simple merge