linux/drivers/media/dvb
Linus Torvalds 76d21c5635 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: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c
2011-03-24 09:50:13 -07:00
..
b2c2 [media] i2c: Stop using I2C_CLASS_TV_DIGITAL 2010-10-21 07:54:26 -02:00
bt8xx Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
dm1105 [media] Rename all public generic RC functions from ir_ to rc_ 2010-12-29 08:16:50 -02:00
dvb-core [media] tuner-core: remove the legacy is_stereo() call 2011-03-21 20:32:00 -03:00
dvb-usb Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
firewire [media] firedtv: drop obsolete backend abstraction 2011-03-21 20:32:21 -03:00
frontends [media] STV0288 added full frontend status 2011-03-22 16:38:28 -03:00
mantis [media] mantis_pci: remove asm/pgtable.h include 2011-03-03 10:15:35 -03:00
ngene [media] Move CI cxd2099 driver to staging 2011-03-21 20:31:47 -03:00
pluto2 [media] i2c: Stop using I2C_CLASS_TV_DIGITAL 2010-10-21 07:54:26 -02:00
pt1 [media] i2c: Stop using I2C_CLASS_TV_DIGITAL 2010-10-21 07:54:26 -02:00
siano [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge 2011-03-22 19:24:14 -03:00
ttpci [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map 2011-03-22 19:24:16 -03:00
ttusb-budget [media] TTUSB DVB: ttusb_boot_dsp() needs to release_firmware() or it leaks memory 2011-03-21 20:32:22 -03:00
ttusb-dec USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
Kconfig [media] firedtv: remove obsolete ieee1394 backend code 2011-03-21 20:32:12 -03:00
Makefile V4L/DVB: ngene: Driver compiles now 2010-02-26 15:10:53 -03:00