linux-next: manual merge of the powerpc tree
From: Stephen Rothwell <hidden>
Date: 2008-07-14 05:45:10
Also in:
linux-next
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 sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 197 bytes