Hi Mauro, On Tue, 13 Oct 2009 07:50:36 -0400 (EDT) Mauro Carvalho Chehab <mchehab@xxxxxxxxxx> wrote: > > Thanks for letting me know. I've rebased it fixing the merge conflict. For now, > I just removed the call to edac_mce_parse() for Uncorrected Errors, since I'll > eventually replace that part of the code with something better. > > You should now be able to merge it without merging conflicts. OK, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpxGeDGsPVoJ.pgp
Description: PGP signature
