Subject: Re: linux-next: manual merge of the sparc tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 17 Sep 2008 07:40:23 +1000

Hi Dave,

On Tue, 16 Sep 2008 14:31:37 -0700 (PDT) David Miller <[email-masked]> wrote:
>
> I just pushed a merge resolution to this by pulling sparc-2.6
> into sparc-next-2.6, moving the PCI config space address
> computer into psycho_common.h, and propagating the bug fix
> from sparc-2.6 into where the code lives now in psycho_common.c

Thanks for that it will get picked up tomorrow.

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