Subject: linux-next: manual merge of the powerpc tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 14 Jul 2008 15:44:59 +1000

Hi Paul, Ben,

Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/Kconfig between commit
4e491d14f2506b218d678935c25a7027b79178b1 ("ftrace: support for PowerPC")
from the ftrace tree and commit 3affedc4e1ce837033b6c5e9289d2ce2f5a62d31
("powerpc/dma: implement new dma_*map*_attrs() interfaces") from the
powerpc tree.

The former commit moved the "select HAVE_OPROFILE" to the bottom of the
"config PPC" list (for no reason that I can fathom) while the latter
added another select.  Simple fixup.  I can carry it.

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