Merge branch 'xt-q8l-v10' of https://github.com/paolosabatino/armbian-build into xt-q8l-v10

2025-03-30 18:51:30 +00:00 · 2018-12-15 10:45:37 +00:00 · 2018-12-15 10:45:37 +00:00 · 6bae467522
commit 6bae467522
parent 868d7390fc c39396fd40
1 changed files with 3 additions and 2 deletions
--- a/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch
+++ b/patch/kernel/rockchip-dev/xt-q8l-v10-add-device-tree.patch
@ -1,6 +1,7 @@
 --- /dev/null
-+++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts	2018-12-09 14:29:56.405019782 +0000
-@@ -0,0 +1,969 @@
+++ b/arch/arm/boot/dts/rk3288-xt-q8l-v10.dts	2018-12-06 21:46:51.493688015 +0000
+@@ -0,0 +1,966 @@
+>>>>>>> c39396fd4027a4ee45eb87ba17e2e0aa7fb89a04
 +/*
 + * Copyright (c) 2014, 2015 FUKAUMI Naoki <naobsd@gmail.com>
 + * 					   2018 Paolo Sabatino <paolo.sabatino@gm**l.com>