linux-next: manual merge of the i7core_edac tree with Linus' tree

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the i7core_edac tree got a conflict in
arch/x86/kernel/cpu/mcheck/mce.c between commit
f436f8bb73138bc74eb1c6527723e00988ad8a8a ("x86: EDAC: MCE: Fix MCE
decoding callback logic") from Linus' tree and commit
699a7dbe1ffdf4b25c1475e45590b181c3e23087 ("edac_mce: Add an interface
driver to report mce errors via edac") from the i7core_edac tree.

I don't know how to resolve these two commits so I have dropped the
i7core_edac tree for today.

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

Attachment: pgp00000.pgp
Description: PGP signature