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

[Stephen Warren]

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 <swarren at nvidia.com>

It would be useful to include the appropriate Fixes: tags in the commit 
message, and this issue was originally:

Reported-by: Kevin Hilman <khilman at linaro.org>