From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas Chou <thomas@wytron.com.tw>
Date: Sat, 5 Dec 2015 13:52:50 +0800
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: <56627BB2.3090700@wytron.com.tw>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 2015?12?04? 23:58, Simon Glass wrote:
> These were added by mistake in commit fde7e189. They cause a warning when
> configuring the boards. Remove them.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> ---
>
>   configs/beaver_defconfig     | 3 ---
>   configs/cardhu_defconfig     | 3 ---
>   configs/jetson-tk1_defconfig | 3 ---
>   configs/trimslice_defconfig  | 3 ---
>   4 files changed, 12 deletions(-)
>

Acked-by: Thomas Chou <thomas@wytron.com.tw>