On Wednesday 25 July 2012 06:48 AM, Stephen Rothwell wrote:
* PGP Signed by an unknown key
Hi Samuel,
Today's linux-next merge of the mfd tree got a conflict in
arch/arm/configs/tegra_defconfig between commit dbebe1589d3a ("ARM:
tegra: defconfig updates") from Linus' tree and commit 05f3ad2b8ae5
("ARM: tegra: defconfig: Enable tps6586x gpio") from the mfd tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
Yes, this fix is proper.
Thanks,
Laxman
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
