From: Xindong Xu <xindong.xu@amlogic.com>
Date: Fri, 3 Jan 2020 05:06:11 +0000 (+0800)
Subject: Merge remote-tracking branch 'remotes/trunk/bringup/amlogic-4.9/sync20190611_forQ... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3bf24bde312a020bf448bdccc9bfd1e066e1a7c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge remote-tracking branch 'remotes/trunk/bringup/amlogic-4.9/sync20190611_forQ' into ref_head
---

a3bf24bde312a020bf448bdccc9bfd1e066e1a7c
diff --cc MAINTAINERS
index 0c57edb6e6c2,58c25232ed47..bac51a3ed829
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15251,7 -15255,11 +15255,16 @@@ M:	Brian Zhu <brian.zhu@amlogic.com
  F: drivers/amlogic/media/video_sink/video_receiver.c
  F: drivers/amlogic/media/video_sink/video_receiver.h
  
 +AMLOGIC DEADPOOL Y3 DTSI
 +M:	Xindong Xu <xindong.xu@amlogic.com>
 +F: arch/arm/boot/dts/amlogic/sm1_s905y3_deadpool.dts
 +F: arch/arm64/boot/dts/amlogic/sm1_s905y3_deadpool.dts
++
+ AMLOGIC UVM DRIVER
+ M:	Ao.Xu <ao.xu@amlogic.com>
+ F:	drivers/amlogic/uvm/meson_uvm.c
+ F:	drivers/amlogic/uvm/meson_uvm.h
+ 
+ AMLOGIC SM1/G12A BL40 HEADER
+ M: shunzhou jiang <shunzhou.jiang@amlogic.com>
+ F: drivers/amlogic/firmware/bl40_module.h