From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark Brown Subject: Re: linux-next: manual merge of the regulator tree with the qcom tree Date: Thu, 17 Dec 2015 11:22:01 +0000 Message-ID: <20151217112201.GR5727@sirena.org.uk> References: <20151217130129.7ba3b7ae@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="1MXu+reqKPHC6GN9" Return-path: Content-Disposition: inline In-Reply-To: <20151217130129.7ba3b7ae@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: Liam Girdwood , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Gross List-Id: linux-next.vger.kernel.org --1MXu+reqKPHC6GN9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Dec 17, 2015 at 01:01:29PM +1100, Stephen Rothwell wrote: > between commit: > f6251e80956d ("soc: qcom: documentation: Update SMD/RPM Docs") > 9ee8373a1552 ("soc: qcom: smd-rpm: Add existing platform support") > from the qcom tree and commit: > 7a400585893e ("soc: qcom: documentation: Update SMD/RPM Docs") > from the regulator tree. > I fixed it up (I used the qcom tree version - please sort out the > mess). Andy, what's going on here? --1MXu+reqKPHC6GN9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWcprZAAoJECTWi3JdVIfQHgEH/2+ik8zxcdxe+juCSH/Qdhkb jXpNtxE63Go64GGuXtulOM4wexYNGFyUVODfBIZdqP6pqf2A3A776/xhYNheb0Ef ZMole/UsFKeb0VxoyiTsLf2jCXcjhgAQ4B2D4o2ISpD1nvJxg19q5dA5BKWpLrns pILRWOwGqgNOssqiNNn6f/cI2PCbu5I1rMSuR9vxa8+TjoMqTcvOvcTCj3mD1YtZ Iduy1F9esuMNhb9jSuMsShOVOOefkvgXDCPTNAN2J+0Q2z6hMDe4iKtTVTi/P0wh LXGrm3ErKcRW8r5HIya6kTTF4I5LEk6DsWSxLYHfp/+XvuvtAuRidJ6NpF7tju0= =V256 -----END PGP SIGNATURE----- --1MXu+reqKPHC6GN9--