On Fri, 4 Dec 2009, Stephen Rothwell wrote: > > > Merging trivial/for-next > > > CONFLICT (content): Merge conflict in Documentation/video4linux/gspca.txt > > > > have you been sending out e-mail about this conflict? I don't seem to have > > received any. > > No, I didn't because it is very simple and was only in a documentation > file. I figured it would be cleared up easily if/when it comes up in > being merged into Linus' tree (or maybe before if it is noticed). Excellent, thanks. -- Jiri Kosina SUSE Labs, Novell Inc. -- 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
