Kevin Hilman ecdf94da6f Linux 4.1-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVa7zvAAoJEHm+PkMAQRiGtfMIAILs3sxFtrC1hApgcfRLF/7z K34bwTRqErzqUO/orTwakEr9kSIpIL0zIPSryTCOTPZLfMGkQjhHXO3KR/DSbbTV MZ8y/BM/yelFA/Np+1LjbiYjTNRnTRvCoaQihkIH8Rn02g7ob9HyL4gIGKpuGFcZ 04GacL2cgChqsRSACdNef948jCoJXKgcuDpe39DXphDWZnBKNZ3HFuJ6bryGJf9A 1/eCI4is85BNwKPemQUYR0xx83UIzDfrghatZP2mOCDDSA2MNg8HNxLTd12LGoQD tfgX4B7aftzW9Y7GSEDfZ0IKm2NRzgPmCVj6PjVR/iI0lIK4Aq0Z/lDJxxEq3XQ= =AJM5 -----END PGP SIGNATURE----- Merge tag 'v4.1-rc6' into next/dt Linux 4.1-rc6 Conflicts: arch/arm/boot/dts/zynq-7000.dtsi Resolution summary: Mainline had an earlier version of the commit, resolve in favor of the newer patch in next/dt branch.		2015-06-11 14:37:45 -07:00
..
foundation-v8.dts	arm64: Add L2 cache topology to ARM Ltd boards/models	2015-02-25 17:12:21 +01:00
juno-base.dtsi	arm64: Juno: Add GICv2m support in device tree.	2015-05-22 16:25:31 +01:00
juno-clocks.dtsi	arm64: Juno: Fix the GIC node address label and the frequency of FAXI clock.	2015-05-22 16:25:07 +01:00
juno-motherboard.dtsi	Linux 4.1-rc6	2015-06-11 14:37:45 -07:00
juno-r1.dts	arm64: Add DT support for Juno r1 board.	2015-05-22 16:25:35 +01:00
juno.dts	arm64: Juno: Split juno.dts into juno-base.dtsi and juno.dts.	2015-05-22 16:25:16 +01:00
Makefile	arm64: Add DT support for Juno r1 board.	2015-05-22 16:25:35 +01:00
rtsm_ve-aemv8a.dts	arm64: Add L2 cache topology to ARM Ltd boards/models	2015-02-25 17:12:21 +01:00
rtsm_ve-motherboard.dtsi	Merge branch 'cleanup/dts-subdirs' into next/arm64	2014-11-20 17:50:37 +01:00