ARM: dts: at91: Fix a typo
authorBhaskar Chowdhury <unixbhaskar@gmail.com>
Thu, 18 Mar 2021 09:52:37 +0000 (15:22 +0530)
committerNicolas Ferre <nicolas.ferre@microchip.com>
Fri, 2 Apr 2021 12:58:56 +0000 (14:58 +0200)
commit174c80b254a0fdc03d86c14fb70859fb26b7060f
tree2a3f7c8b5943f4a5490c761c1f35010f9a67d2f7
parenta38fd8748464831584a19438cbb3082b5a2dab15
ARM: dts: at91: Fix a typo

s/conlicts/conflicts/

Signed-off-by: Bhaskar Chowdhury <unixbhaskar@gmail.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20210318095237.28436-1-unixbhaskar@gmail.com
arch/arm/boot/dts/sama5d3.dtsi