[U-Boot] [PATCH 1/4] tegra: Remove merge markers in some Kconfig files

Thomas Chou
2015-12-05T05:52:50Z

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>