From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom Rini <trini@konsulko.com>
Date: Sun, 6 Dec 2015 17:08:08 -0500
Subject: [U-Boot] [U-Boot,
	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: <20151206220808.GA9551@bill-the-cat>
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 Fri, Dec 04, 2015 at 08:58:37AM -0700, Simon Glass wrote:

> These were added by mistake in commit fde7e189. They cause a warning when
> configuring the boards. Remove them.
> 
> Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig")
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Reported-by: Stephen Warren <swarren@nvidia.com>
> Tested-by: Stephen Warren <swarren@nvidia.com>
> Reported-by: Kevin Hilman <khilman@linaro.org>
> Acked-by: Thomas Chou <thomas@wytron.com.tw>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151206/3dbcf8ea/attachment.sig>