The patch number 8522 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
videodev2: Fix merge conflict
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/gspca/conex.c | 4
linux/drivers/media/video/gspca/etoms.c | 25 -
linux/drivers/media/video/gspca/gspca.c | 11
linux/drivers/media/video/gspca/mars.c | 4
linux/drivers/media/video/gspca/ov519.c | 28 -
linux/drivers/media/video/gspca/pac207.c | 19 -
linux/drivers/media/video/gspca/pac7311.c | 17 -
linux/drivers/media/video/gspca/sonixb.c | 134 +++-----
linux/drivers/media/video/gspca/sonixj.c | 245 ++-------------
linux/drivers/media/video/gspca/spca500.c | 134 +-------
linux/drivers/media/video/gspca/spca501.c | 70 ----
linux/drivers/media/video/gspca/spca505.c | 135 +-------
linux/drivers/media/video/gspca/spca506.c | 116 +------
linux/drivers/media/video/gspca/spca508.c | 159 +--------
linux/drivers/media/video/gspca/spca561.c | 57 +--
linux/drivers/media/video/gspca/stk014.c | 4
linux/drivers/media/video/gspca/sunplus.c | 356 ++++------------------
linux/drivers/media/video/gspca/t613.c | 17 -
linux/drivers/media/video/gspca/tv8532.c | 12
linux/drivers/media/video/gspca/vc032x.c | 39 --
linux/drivers/media/video/gspca/zc3xx.c | 126 +++----
linux/include/linux/videodev2.h | 2
22 files changed, 431 insertions(+), 1283 deletions(-)
<diff discarded since it is too big>
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/679674c40564837835d627f24aa0376afd54a3ac
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
