[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20120813200458.GA21207@opensource.wolfsonmicro.com>
Date: Mon, 13 Aug 2012 21:04:59 +0100
From: Mark Brown <broonie@...nsource.wolfsonmicro.com>
To: Stephen Warren <swarren@...dotorg.org>
Cc: Laxman Dewangan <ldewangan@...dia.com>, sameo@...ux.intel.com,
grant.likely@...retlab.ca, rob.herring@...xeda.com,
swarren@...dia.com, linux-kernel@...r.kernel.org,
linux-doc@...r.kernel.org, devicetree-discuss@...ts.ozlabs.org
Subject: Re: [PATCH V3] regulator: tps6586x: add support for SYS rail
On Mon, Aug 13, 2012 at 11:42:57AM -0600, Stephen Warren wrote:
> This patch appears to have been applied correctly as b93fffb in your
> tree, but your for-next branch merge commit f110340 appears to have
> dropped the following two hunks:
Ugh, the device tree cleanup that we're making urgently to Linus' tree
for some reason I can't remember conflicts with the new code but looks
like a rename. I'll try to remember to fix next time I merge.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists