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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Dave,

On Tue, 16 Sep 2008 14:31:37 -0700 (PDT) David Miller <davem@xxxxxxxxxxxxx> 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                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpyaf8nZyW49.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux