You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		14 years ago
..
b2c2	[media] i2c: Stop using I2C_CLASS_TV_DIGITAL	15 years ago
bt8xx	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	15 years ago
dm1105	[media] Rename all public generic RC functions from ir_ to rc_	14 years ago
dvb-core	[media] tuner-core: remove the legacy is_stereo() call	14 years ago
dvb-usb	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	14 years ago
firewire	[media] firedtv: drop obsolete backend abstraction	14 years ago
frontends	[media] STV0288 added full frontend status	14 years ago
mantis	[media] mantis_pci: remove asm/pgtable.h include	14 years ago
ngene	[media] Move CI cxd2099 driver to staging	14 years ago
pluto2	[media] i2c: Stop using I2C_CLASS_TV_DIGITAL	15 years ago
pt1	[media] i2c: Stop using I2C_CLASS_TV_DIGITAL	15 years ago
siano	[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge	14 years ago
ttpci	[media] remove the old RC_MAP_HAUPPAUGE_NEW RC map	14 years ago
ttusb-budget	[media] TTUSB DVB: ttusb_boot_dsp() needs to release_firmware() or it leaks memory	14 years ago
ttusb-dec	USB: rename usb_buffer_alloc() and usb_buffer_free() users	15 years ago
Kconfig	[media] firedtv: remove obsolete ieee1394 backend code	14 years ago
Makefile	V4L/DVB: ngene: Driver compiles now	15 years ago