lkml.org 
[lkml]   [2012]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the mfd tree with Linus' tree
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


\
 
 \ /
  Last update: 2012-07-25 09:41    [W:0.036 / U:0.156 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site