• Linus Torvalds's avatar
    Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 · 76d21c56
    Linus Torvalds authored
    * '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
    76d21c56
wl1273.c 12.7 KB