linux-next: manual merge of the staging tree with the l2-mtd tree

From: Stephen Rothwell
Date: Wed Dec 28 2011 - 01:55:14 EST

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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature