The patch number 9683 was added via Jean-Francois Moine <[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]

------

merge: v4l-dvb


---

 linux/Documentation/video4linux/CARDLIST.cx88           |    3 
 linux/Documentation/video4linux/CARDLIST.em28xx         |    1 
 linux/Documentation/video4linux/bttv/CONTRIBUTORS       |    2 
 linux/drivers/media/dvb/dm1105/dm1105.c                 |    2 
 linux/drivers/media/dvb/dvb-usb/dw2102.c                |   12 
 linux/drivers/media/dvb/dvb-usb/usb-urb.c               |   23 
 linux/drivers/media/dvb/frontends/Makefile              |    1 
 linux/drivers/media/dvb/frontends/stb0899_algo.c        |    2 
 linux/drivers/media/dvb/frontends/stb0899_cfg.h         |   10 
 linux/drivers/media/dvb/frontends/stb0899_priv.h        |    8 
 linux/drivers/media/dvb/frontends/tda8261.h             |    2 
 linux/drivers/media/dvb/ttpci/budget-ci.c               |   10 
 linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c |   15 
 linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c           |    7 
 linux/drivers/media/radio/dsbr100.c                     |   73 ++
 linux/drivers/media/video/cx18/cx18-driver.c            |   16 
 linux/drivers/media/video/cx18/cx18-driver.h            |   16 
 linux/drivers/media/video/cx18/cx18-dvb.c               |   37 -
 linux/drivers/media/video/cx18/cx18-firmware.c          |   37 +
 linux/drivers/media/video/cx18/cx18-io.c                |   11 
 linux/drivers/media/video/cx18/cx18-io.h                |    1 
 linux/drivers/media/video/cx18/cx18-irq.c               |   32 -
 linux/drivers/media/video/cx18/cx18-irq.h               |    1 
 linux/drivers/media/video/cx18/cx18-mailbox.c           |  219 ++++----
 linux/drivers/media/video/cx18/cx18-mailbox.h           |    7 
 linux/drivers/media/video/cx18/cx18-streams.c           |    6 
 linux/drivers/media/video/cx18/cx18-version.h           |    2 
 linux/drivers/media/video/cx88/cx88-cards.c             |   82 ++-
 linux/drivers/media/video/cx88/cx88-dvb.c               |  137 ++---
 linux/drivers/media/video/cx88/cx88.h                   |    3 
 linux/drivers/media/video/em28xx/em28xx-audio.c         |   14 
 linux/drivers/media/video/em28xx/em28xx-cards.c         |   56 +-
 linux/drivers/media/video/em28xx/em28xx-core.c          |   26 
 linux/drivers/media/video/em28xx/em28xx-i2c.c           |   11 
 linux/drivers/media/video/em28xx/em28xx-input.c         |  271 +++++++++-
 linux/drivers/media/video/em28xx/em28xx-reg.h           |   20 
 linux/drivers/media/video/em28xx/em28xx-video.c         |   75 ++
 linux/drivers/media/video/em28xx/em28xx.h               |   13 
 linux/drivers/media/video/saa7134/saa7134-dvb.c         |   24 
 linux/drivers/media/video/tvaudio.c                     |  228 +++++---
 linux/drivers/media/video/uvc/uvc_ctrl.c                |    2 
 linux/drivers/media/video/uvc/uvc_driver.c              |  171 +-----
 linux/drivers/media/video/uvc/uvc_status.c              |   12 
 linux/drivers/media/video/uvc/uvc_v4l2.c                |   10 
 linux/drivers/media/video/uvc/uvc_video.c               |   69 ++
 linux/drivers/media/video/uvc/uvcvideo.h                |   15 
 linux/drivers/media/video/v4l2-ioctl.c                  |   86 +++
 linux/include/media/v4l2-ioctl.h                        |    6 
 linux/sound/pci/bt87x.c                                 |    3 
 v4l/compat.h                                            |   71 ++
 v4l/versions.txt                                        |    3 
 v4l2-apps/test/capture_example.c                        |   25 
 52 files changed, 1403 insertions(+), 586 deletions(-)

<diff discarded since it is too big>

---

Patch is available at: 
http://linuxtv.org/hg/v4l-dvb/rev/ba3eafc8ead263f274e8bcfb54c13f74b3a12266

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to