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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 14 Oct 2008 12:02:59 +1100

Hi Paul, Ben,

Today's linux-next merge of the powerpc tree got a conflict in
arch/powerpc/include/asm/dcr-regs.h between commit
6fbc779c03591ee536fef9efb7d7e20f281d0b5c ("ibm_newemac: Fix EMAC soft
reset on 460EX/GT") from Linus' tree and commit
fbcc4bacee30cad4e4a13d05492a9ed0c9c3e8c7 ("ibm_newemac: MAL support for
PowerPC 405EZ") from the powerpc tree.

Just overlapping additions.  I fixed it up by taking both additions.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/