[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20141203151302.6e273bd4@canb.auug.org.au>
Date: Wed, 3 Dec 2014 15:13:02 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jiri Kosina <jkosina@...e.cz>,
"Rafael J. Wysocki" <rjw@...ysocki.net>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Paul Bolle <pebolle@...cali.nl>
Subject: Re: linux-next: manual merge of the trivial tree with the pm tree
Hi,
On Wed, 3 Dec 2014 15:01:53 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> I fixed it up (the pm tree change was a subset of the trivial tree one)
^^^^^^
superset
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists