lkml.org 
[lkml]   [2011]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2011-12-28 07:57    [W:0.043 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site