Hi Jesper,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/edac.txt between commit
327dafb1c61c9da7b95ac6cc7634a2340cc9509c ("edac: core fix redundant sysfs
controls to parameters") from Linus' tree and commit
0bb08241ce68aaa70b7b804b4d6319d8bad3ae24 ("Tighten up the use of loose")
from the trivial tree.
The former removed the whole section of the file in which the latter had
fixed a spelling mistake.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgparDEms3o2g.pgp
Description: PGP signature
