diff options
author | Al Viro | 2014-12-09 02:39:29 +0100 |
---|---|---|
committer | Al Viro | 2014-12-09 02:39:29 +0100 |
commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
tree | c08504e4d2fa51ac91cef544f336d0169806c49f /arch/arm/boot/dts/sama5d31.dtsi | |
parent | Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | copy_from_iter_nocache() (diff) | |
download | kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.gz kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.tar.xz kernel-qcow2-linux-ba00410b8131b23edfb0e09f8b6dd26c8eb621fb.zip |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'arch/arm/boot/dts/sama5d31.dtsi')
-rw-r--r-- | arch/arm/boot/dts/sama5d31.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d31.dtsi b/arch/arm/boot/dts/sama5d31.dtsi index 7997dc9863ed..883878b32971 100644 --- a/arch/arm/boot/dts/sama5d31.dtsi +++ b/arch/arm/boot/dts/sama5d31.dtsi @@ -12,5 +12,5 @@ #include "sama5d3_uart.dtsi" / { - compatible = "atmel,samad31", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; }; |