Em 01-11-2011 10:54, Borislav Petkov escreveu: > On Tue, Nov 01, 2011 at 07:58:02AM -0400, Mauro Carvalho Chehab wrote: >> Sorry, it were caused by a bad merge conflict resolution. The include >> isn't need anymore. >> >> The MAINTAINERS fix is indeed needed. >> >>> I have used the version of the edac tree from next-20111025 for today. >> >> I'm fixing both issues for tomorrow's next. > > Btw, you're sending those to Linus soon, right? Yes, likely tomorrow, if no surprises at linux-next merge arise. > > Thanks. > -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html