Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits) [media] rc: call input_sync after scancode reports [media] imon: allow either proto on unknown 0xffdc [media] imon: auto-config ffdc 7e device [media] saa7134: fix raw IR timeout value [media] rc: fix ghost keypresses with certain hw [media] [staging] lirc_serial: allocate irq at init time [media] lirc_zilog: fix spinning rx thread [media] keymaps: fix table for pinnacle pctv hd devices [media] ite-cir: 8709 needs to use pnp resource 2 [media] V4L: mx1-camera: fix uninitialized variable [media] omap_vout: Added check in reqbuf & mmap for buf_size allocation [media] OMAP_VOUT: Change hardcoded device node number to -1 [media] OMAP_VOUTLIB: Fix wrong resizer calculation [media] uvcvideo: Disable the queue when failing to start [media] uvcvideo: Remove buffers from the queues when freeing [media] uvcvideo: Ignore entities for terminals with no supported format [media] v4l: Don't access media entity after is has been destroyed [media] media: omap3isp: fix a potential NULL deref [media] media: vb2: fix allocation failure check [media] media: vb2: reset queued_count value during queue reinitialization ... Fix up trivial conflict in MAINTAINERS as per Mauro
No related branches found
No related tags found
Showing
- MAINTAINERS 1 addition, 0 deletionsMAINTAINERS
- drivers/media/rc/fintek-cir.c 5 additions, 0 deletionsdrivers/media/rc/fintek-cir.c
- drivers/media/rc/imon.c 17 additions, 2 deletionsdrivers/media/rc/imon.c
- drivers/media/rc/ir-raw.c 3 additions, 1 deletiondrivers/media/rc/ir-raw.c
- drivers/media/rc/ite-cir.c 9 additions, 3 deletionsdrivers/media/rc/ite-cir.c
- drivers/media/rc/ite-cir.h 3 additions, 0 deletionsdrivers/media/rc/ite-cir.h
- drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c 27 additions, 31 deletionsdrivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c
- drivers/media/rc/lirc_dev.c 27 additions, 10 deletionsdrivers/media/rc/lirc_dev.c
- drivers/media/rc/mceusb.c 38 additions, 42 deletionsdrivers/media/rc/mceusb.c
- drivers/media/rc/nuvoton-cir.c 0 additions, 2 deletionsdrivers/media/rc/nuvoton-cir.c
- drivers/media/rc/nuvoton-cir.h 0 additions, 1 deletiondrivers/media/rc/nuvoton-cir.h
- drivers/media/rc/rc-main.c 25 additions, 23 deletionsdrivers/media/rc/rc-main.c
- drivers/media/video/m5mols/m5mols.h 29 additions, 28 deletionsdrivers/media/video/m5mols/m5mols.h
- drivers/media/video/m5mols/m5mols_capture.c 11 additions, 11 deletionsdrivers/media/video/m5mols/m5mols_capture.c
- drivers/media/video/m5mols/m5mols_controls.c 3 additions, 3 deletionsdrivers/media/video/m5mols/m5mols_controls.c
- drivers/media/video/m5mols/m5mols_core.c 91 additions, 53 deletionsdrivers/media/video/m5mols/m5mols_core.c
- drivers/media/video/m5mols/m5mols_reg.h 16 additions, 5 deletionsdrivers/media/video/m5mols/m5mols_reg.h
- drivers/media/video/mx1_camera.c 3 additions, 7 deletionsdrivers/media/video/mx1_camera.c
- drivers/media/video/omap/omap_vout.c 17 additions, 1 deletiondrivers/media/video/omap/omap_vout.c
- drivers/media/video/omap/omap_voutlib.c 3 additions, 3 deletionsdrivers/media/video/omap/omap_voutlib.c
Loading
Please register or sign in to comment