Subject: linux-next: manual merge of the suspend tree with the mips tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 11 May 2011 13:06:18 +1000

Hi Rafael,

Today's linux-next merge of the suspend tree got a conflict in
arch/mips/alchemy/common/dbdma.c between commit 02810a022fd9 ("MIPS:
Alchemy: Convert dbdma.c to syscore_ops") from the mips tree and commit
4d0fb1376519 ("PM / MIPS: Use struct syscore_ops instead of sysdevs for
PM (v2)") from the suspend tree.

These seem to be trying to do the same thing.  I used the version from
the mips tree for now.  Please sort this out ...

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/