linux-next: manual merge of the edac tree with the trivial tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Hi Mauro,

Today's linux-next merge of the edac tree got a conflict in
drivers/edac/edac_core.h between commit 15ed103a9800 ("edac: Fix spelling
errors") from the trivial tree and commit 90b40d5cadba ("edac: Remove the
legacy EDAC ABI") from the edac tree.

One of the comments fixed by the former is removed by the latter, so I
did that.
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgppgRQTxvHcb.pgp
Description: PGP signature

[Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Free Online Dating]     [Linux Kernel]     [Linux SCSI]     [XFree86]

Add to Google Powered by Linux