Re: linux-next: Tree for December 3

Stephen Rothwell
2009-12-03T14:13:24Z

[-- Attachment #1: Type: text/plain, Size: 621 bytes --]

Hi Jiri,

On Thu, 3 Dec 2009 14:37:06 +0100 (CET) Jiri Kosina <jkosina@suse.cz> 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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]