From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the trivial tree with the pm tree Date: Wed, 3 Dec 2014 15:13:02 +1100 Message-ID: <20141203151302.6e273bd4@canb.auug.org.au> References: <20141203150153.7bbf3eb1@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/yDpqHmhCS2S9tdjxqNPoaj3"; protocol="application/pgp-signature" Return-path: Received: from ozlabs.org ([103.22.144.67]:40765 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750798AbaLCENN (ORCPT ); Tue, 2 Dec 2014 23:13:13 -0500 In-Reply-To: <20141203150153.7bbf3eb1@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Jiri Kosina , "Rafael J. Wysocki" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Bolle --Sig_/yDpqHmhCS2S9tdjxqNPoaj3 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi, On Wed, 3 Dec 2014 15:01:53 +1100 Stephen Rothwell w= rote: > > I fixed it up (the pm tree change was a subset of the trivial tree one) ^^^^^^ superset --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Sig_/yDpqHmhCS2S9tdjxqNPoaj3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJUfo3UAAoJEMDTa8Ir7ZwVei8QAJFpkUar1E0574MByB3fOPAj Zyh3Mha+LoI2cx84vumA1anaxkGMwiGfABsetzp+j0OuqylC9F9TakiDmtOc1jF4 Jc/UBr68gofw6DbeDj458rTB4z8GsEVmYw8H+UHRT9cFYqMf1r6tqU6tTZpaBvyv YeLh6aZmT1Ga2DzWlseDzKEFD/pjG/wc152tlI1J0ymeQ8eX1FkvJJI9uohUYwqD I1XvFBLzsZqEuePzkOQtO6J/s2J+GV97ngLRwn29ySquHV0J254PG+26PuVxl8vY P/c+SPh2CkB5L14L2+XeJTeoMoI6h2q8/IomaHVEK5F5et1y/Gucv+lCnGNfuSQ2 Bh9dYELTVGzBog5TjfYd7vyhjZIeS6NRVJlOfVSBixD5DNIbIcq8eR23R4bUcnBX 3GOo15Mb65au0ahxGaaW0oR3Cfww5IVGlwUj8MeGgM6IHwoaNvyXswXy2vyBJ8Vc JnDG4Q2XI/lntVSBT/DY9fOiyUuR91yCMFsW/RtvQIwCwnUNdladxtqfsb53GamM RNBUKkKYGmE2Z3PCQroGmjtujZTc4DbRvnM6vFxdE1CbYWeb4h5gGBaZcfl36ZIi l3fXd/N2qFXCKjQhxf3MbrXmFE7l8yVTQTCMpGmex45XNfH1WkXmVwTUCaXWQty8 Pk+4qO+BFyWlXCsMZ4+U =tCXb -----END PGP SIGNATURE----- --Sig_/yDpqHmhCS2S9tdjxqNPoaj3--