mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
76d21c5635
* '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 |
||
|---|---|---|
| .. | ||
| a800.c | ||
| af9005-fe.c | ||
| af9005-remote.c | ||
| af9005-script.h | ||
| af9005.c | ||
| af9005.h | ||
| af9015.c | ||
| af9015.h | ||
| anysee.c | ||
| anysee.h | ||
| au6610.c | ||
| au6610.h | ||
| az6027.c | ||
| az6027.h | ||
| ce6230.c | ||
| ce6230.h | ||
| cinergyT2-core.c | ||
| cinergyT2-fe.c | ||
| cinergyT2.h | ||
| cxusb.c | ||
| cxusb.h | ||
| dib07x0.h | ||
| dib0700_core.c | ||
| dib0700_devices.c | ||
| dib0700.h | ||
| dibusb-common.c | ||
| dibusb-mb.c | ||
| dibusb-mc.c | ||
| dibusb.h | ||
| digitv.c | ||
| digitv.h | ||
| dtt200u-fe.c | ||
| dtt200u.c | ||
| dtt200u.h | ||
| dtv5100.c | ||
| dtv5100.h | ||
| dvb-usb-common.h | ||
| dvb-usb-dvb.c | ||
| dvb-usb-firmware.c | ||
| dvb-usb-i2c.c | ||
| dvb-usb-ids.h | ||
| dvb-usb-init.c | ||
| dvb-usb-remote.c | ||
| dvb-usb-urb.c | ||
| dvb-usb.h | ||
| dw2102.c | ||
| dw2102.h | ||
| ec168.c | ||
| ec168.h | ||
| friio-fe.c | ||
| friio.c | ||
| friio.h | ||
| gl861.c | ||
| gl861.h | ||
| gp8psk-fe.c | ||
| gp8psk.c | ||
| gp8psk.h | ||
| Kconfig | ||
| lmedm04.c | ||
| lmedm04.h | ||
| m920x.c | ||
| m920x.h | ||
| Makefile | ||
| nova-t-usb2.c | ||
| opera1.c | ||
| technisat-usb2.c | ||
| ttusb2.c | ||
| ttusb2.h | ||
| umt-010.c | ||
| usb-urb.c | ||
| vp702x-fe.c | ||
| vp702x.c | ||
| vp702x.h | ||
| vp7045-fe.c | ||
| vp7045.c | ||
| vp7045.h | ||