linux-next: manual merge of the tip tree with the powerpc tree

From: Stephen Rothwell
Date: Wed Jul 28 2010 - 00:39:11 EST

Hi all,

Today's linux-next merge of the tip tree got some complex a conflicts in
arch/powerpc/kernel/time.c between a couple of commits from the powerpc
tree and a set of commits from the tip tree.

Since John has posted a new revision of the patches that are in the tip
tree that will resolve these conflicts. I just used the tip tree from
next-20100727 for today (and hope this will be better tomorrow).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature