Messages in this thread | | | Date | Wed, 28 Dec 2011 17:54:40 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the l2-mtd tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |