From: Otavio Salvador <otavio@ossystems.com.br>
Date: Thu, 21 Oct 2021 12:03:35 +0000 (-0300)
Subject: Merge pull request #894 from hongxu-jia/master
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=537fc132d921619b98c07b1d2e2362411ae889e0;p=meta-freescale.git

Merge pull request #894 from hongxu-jia/master

support user merge
---

537fc132d921619b98c07b1d2e2362411ae889e0