Re: [PATCH] Video for Linux Docummentation

[Andrew Morton]

Michael Krufky <mkrufky@xxxxxxx> wrote:
>
>  My fix-for-cx88-cardsc-for-dvico-fusionhdtv-3-gold-q.patch in -mm 
>  conflicts with the Video for Linux Documentation patch.

I got it all merged up OK.

>  I think you 
>  should just drop my patch, since it's in v4l cvs as card=28 (instead of 
>  card=27, in -mm).  I guess it will get into the kernel when the rest of 
>  v4l synchronizes.

Nah.  Please review next -mm and send any needed fixes.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/