From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Thu, 3 Dec 2015 14:35:49 -0700
Subject: [U-Boot] [PATCH v5 1/8] dm: tegra: pci: Move CONFIG_PCI_TEGRA
	to Kconfig
In-Reply-To: <1447990022-6969-2-git-send-email-sjg@chromium.org>
References: <1447990022-6969-1-git-send-email-sjg@chromium.org>
 <1447990022-6969-2-git-send-email-sjg@chromium.org>
Message-ID: <5660B5B5.90603@wwwdotorg.org>
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 11/19/2015 08:26 PM, Simon Glass wrote:
> Move this option to Kconfig and fix up all users.

The version of this that got committed (as fde7e18938d8) contains merge 
markers in a four files.