Re: linux-next: manual merge of the rr tree with the tree

[Stephen Rothwell]

Hi all,

On Tue, 9 Jun 2009 13:56:27 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the rr tree got a conflict in
> arch/x86/kernel/cpu/mcheck/mce{,_64}.c between commit mce_init_device
> ("x86, mce: Rename sysfs variables") from the  tree and commit
                                               ^^^
x86

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature