From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Date: Fri, 4 Dec 2015 10:16:34 -0700 Subject: [U-Boot] [PATCH 1/4] tegra: Remove merge markers in some Kconfig files In-Reply-To: <1449244720-19253-1-git-send-email-sjg@chromium.org> References: <1449244720-19253-1-git-send-email-sjg@chromium.org> Message-ID: <5661CA72.20307@wwwdotorg.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 12/04/2015 08:58 AM, Simon Glass wrote: > These were added by mistake in commit fde7e189. They cause a warning when > configuring the boards. Remove them. Patches 1-3, Tested-by: Stephen Warren It would be useful to include the appropriate Fixes: tags in the commit message, and this issue was originally: Reported-by: Kevin Hilman