linux/drivers/media/pci/ivtv
Mauro Carvalho Chehab a32f7d1ad3 Merge branch 'v4l_for_linus' into staging/for_v3.9
* v4l_for_linus: (464 commits)
  [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures
  [media] uvcvideo: Cleanup leftovers of partial revert
  [media] uvcvideo: Return -EACCES when trying to set a read-only control
  Linux 3.8-rc3
  mm: reinstante dropped pmd_trans_splitting() check
  cred: Remove tgcred pointer from struct cred
  drm/ttm: fix fence locking in ttm_buffer_object_transfer
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  drm/prime: drop reference on imported dma-buf come from gem
  xen/netfront: improve truesize tracking
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  sctp: fix Kconfig bug in default cookie hmac selection
  EDAC: Cleanup device deregistering path
  ...

Conflicts:
	drivers/media/pci/dm1105/dm1105.c
	drivers/media/platform/soc_camera/mx2_camera.c
2013-01-24 18:49:18 -02:00
..
Kconfig [media] ivtv-alsa: Remove EXPERIMENTAL from Kconfig and revise Kconfig help text 2012-09-18 15:34:59 -03:00
Makefile [media] ivtv, ivtv-alsa: Add initial ivtv-alsa interface driver for ivtv 2012-09-18 13:26:50 -03:00
ivtv-alsa-main.c [media] ivtv: get rid of warning: no previous prototype 2012-10-27 18:04:09 -02:00
ivtv-alsa-mixer.c [media] ivtv, ivtv-alsa: Add initial ivtv-alsa interface driver for ivtv 2012-09-18 13:26:50 -03:00
ivtv-alsa-mixer.h [media] ivtv, ivtv-alsa: Add initial ivtv-alsa interface driver for ivtv 2012-09-18 13:26:50 -03:00
ivtv-alsa-pcm.c [media] ivtv: get rid of warning: no previous prototype 2012-10-27 18:04:09 -02:00
ivtv-alsa-pcm.h [media] ivtv: get rid of warning: no previous prototype 2012-10-27 18:04:09 -02:00
ivtv-alsa.h [media] ivtv, ivtv-alsa: Add initial ivtv-alsa interface driver for ivtv 2012-09-18 13:26:50 -03:00
ivtv-cards.c
ivtv-cards.h
ivtv-controls.c
ivtv-controls.h
ivtv-driver.c Merge branch 'v4l_for_linus' into staging/for_v3.9 2013-01-24 18:49:18 -02:00
ivtv-driver.h [media] ivtv-alsa, ivtv: Connect ivtv PCM capture stream to ivtv-alsa interface driver 2012-09-18 13:29:07 -03:00
ivtv-fileops.c [media] ivtv: fix v4l2-compliance errors for the radio device 2012-10-01 17:14:27 -03:00
ivtv-fileops.h [media] ivtv, ivtv-alsa: Add initial ivtv-alsa interface driver for ivtv 2012-09-18 13:26:50 -03:00
ivtv-firmware.c [media] ivtv: get rid of warning: no previous prototype 2012-10-27 18:04:09 -02:00
ivtv-firmware.h
ivtv-gpio.c
ivtv-gpio.h
ivtv-i2c.c [media] ivtv: Replace memcpy with struct assignment 2012-12-27 19:01:34 -02:00
ivtv-i2c.h
ivtv-ioctl.c [media] ivtv-ioctl.c: remove an useless check 2012-10-27 18:04:33 -02:00
ivtv-ioctl.h
ivtv-irq.c [media] ivtv-alsa, ivtv: Connect ivtv PCM capture stream to ivtv-alsa interface driver 2012-09-18 13:29:07 -03:00
ivtv-irq.h
ivtv-mailbox.c
ivtv-mailbox.h
ivtv-queue.c
ivtv-queue.h
ivtv-routing.c
ivtv-routing.h
ivtv-streams.c [media] ivtv: disable a bunch of ioctls that are invalid for the decoder VBI 2012-10-01 17:23:24 -03:00
ivtv-streams.h
ivtv-udma.c
ivtv-udma.h
ivtv-vbi.c
ivtv-vbi.h
ivtv-version.h
ivtv-yuv.c
ivtv-yuv.h
ivtvfb.c