• Linus Torvalds's avatar
    Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 8762541f
    Linus Torvalds authored
    Pull second set of media updates from Mauro Carvalho Chehab:
    
     - radio API: add support to work with radio frequency bands
    
     - new AM/FM radio drivers: radio-shark, radio-shark2
    
     - new Remote Controller USB driver: iguanair
    
     - conversion of several drivers to the v4l2 core control framework
    
     - new board additions at existing drivers
    
     - the remaining (and vast majority of the patches) are due to
       drivers/DocBook fixes/cleanups.
    
    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (154 commits)
      [media] radio-tea5777: use library for 64bits div
      [media] tlg2300: Declare MODULE_FIRMWARE usage
      [media] lgs8gxx: Declare MODULE_FIRMWARE usage
      [media] xc5000: Add MODULE_FIRMWARE statements
      [media] s2255drv: Add MODULE_FIRMWARE statement
      [media] dib8000: move dereference after check for NULL
      [media] Documentation: Update cardlists
      [media] bttv: add support for Aposonic W-DVR
      [media] cx25821: Remove bad strcpy to read-only char*
      [media] pms.c: remove duplicated include
      [media] smiapp-core.c: remove duplicated include
      [media] via-camera: pass correct format settings to sensor
      [media] rtl2832.c: minor cleanup
      [media] Add support for the IguanaWorks USB IR Transceiver
      [media] Minor cleanups for MCE USB
      [media] drivers/media/dvb/siano/smscoreapi.c: use list_for_each_entry
      [media] Use a named union in struct v4l2_ioctl_info
      [media] mceusb: Add Twisted Melon USB IDs
      [media] staging/media/solo6x10: use module_pci_driver macro
      [media] staging/media/dt3155v4l: use module_pci_driver macro
      ...
    
    Conflicts:
    	Documentation/feature-removal-schedule.txt
    8762541f
ov534_9.c 33.5 KB