tree 64bbc50c3a3de1005405128dfc2b85e066868e8f
parent 91e00202edcad8e06740e5c72336ea7d0e61a27f
author Lotus Xu <xuxiaohan@bytedance.com> 1624937026 +0800
committer lotus xu <xuxiaohan@bytedance.com> 1624946360 +0000

bytedance: g220a: linux: Fix uart patch conflict

Signed-off-by: Lotus Xu <xuxiaohan@bytedance.com>
Change-Id: I78521f447c361c1bb3c4746a2d28016d123d2029