Messages in this thread | | | Date | Tue, 9 Jun 2009 19:52:00 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the rr tree with the tree |
| |
Hi all,
On Tue, 9 Jun 2009 13:56:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |