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

[Stephen Rothwell]

Hi Borislav,

Today's linux-next merge of the edac-amd tree got a conflict in:

  drivers/edac/mce_amd_inj.c

between commits from Linus' tree and the same commits plus more from
the edac-amd tree.

I just dropped the edac-amd tree for today as it seems that it was just
rebased and a few commits dropped before Linus was asked to merge it.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpWn4LtloNP3.pgp
Description: OpenPGP digital signature