From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932236AbbJPOri (ORCPT <rfc822;w@1wt.eu>);
	Fri, 16 Oct 2015 10:47:38 -0400
Received: from mezzanine.sirena.org.uk ([106.187.55.193]:32957 "EHLO
	mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S932084AbbJPOrh (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 16 Oct 2015 10:47:37 -0400
Date: Fri, 16 Oct 2015 15:47:26 +0100
From: Mark Brown <broonie@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rob Herring <robherring2@gmail.com>, Liam Girdwood <lgirdwood@gmail.com>,
        linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Tomeu Vizoso <tomeu.vizoso@collabora.com>
Message-ID: <20151016144726.GP14956@sirena.org.uk>
References: <20151016140704.198b10d8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="E6EZ4qVJn/rWPYaj"
Content-Disposition: inline
In-Reply-To: <20151016140704.198b10d8@canb.auug.org.au>
X-Cookie: Do you like "TENDER VITTLES"?
User-Agent: Mutt/1.5.24 (2015-08-30)
X-SA-Exim-Connect-IP: 94.175.94.161
X-SA-Exim-Mail-From: broonie@sirena.org.uk
Subject: Re: linux-next: manual merge of the dt-rh tree with the regulator
 tree
X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000)
X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


--E6EZ4qVJn/rWPYaj
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Oct 16, 2015 at 02:07:04PM +1100, Stephen Rothwell wrote:

>   5634acd9c8e3 ("regulator: core: Probe regulators on demand")

> from the dt-rh tree.

> I fixed it up (I think - see below) and can carry the fix as necessary
> (no action is required).

Yes, that looks about right.

--E6EZ4qVJn/rWPYaj
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQEcBAEBCAAGBQJWIQ39AAoJECTWi3JdVIfQtOcH/1RTUW0+fE9EEoTq5SwimuMg
WUJC7Ex1U/EYCW9YSp4u7pH9IcDewXFQteB/frBB7K5386dBu0UvwrWGH5ysJlyK
4FXZAmPL3lIN4d66rWwsGpUbDlF2j919lkqYfRWv1GAkRk26WxB/XRUUmH5fZccZ
+YQ4/gJO0PJXKBCYcxD24IxvikfkRZxU/zpdIj4DNm1iZ/8SOEluMAimM/r2BntP
/BQhaXlOqV7g4uU5AbtDmPtU8YQsFLZHbRT0yzkoLamlBvUSi6/fEgLzyoK8fI5j
rf0iyCwoGqHzku3tvXRypVgb15LHDhVVFu9LjOD8lw+NXx43JbIXiVBIRWnZ4/k=
=YhEv
-----END PGP SIGNATURE-----

--E6EZ4qVJn/rWPYaj--