Re: linux-next: manual merge of the trivial tree with the pm tree

From: Stephen Rothwell
Date: Tue Dec 02 2014 - 23:13:58 EST


Hi,

On Wed, 3 Dec 2014 15:01:53 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> I fixed it up (the pm tree change was a subset of the trivial tree one)
^^^^^^
superset

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpAsXWDAAT0k.pgp
Description: OpenPGP digital signature