Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/spectra/lld_mtd.c between a series of commits from the
l2-mtd tree and commit be7f39c5ecf5 ("Staging: delete spectra driver")
from the staging tree.
I just removed the file.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpezVWhrw5Iy.pgp
Description: PGP signature
