• Linus Torvalds's avatar
    Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 6df419e4
    Linus Torvalds authored
    Pull media updates from Mauro Carvalho Chehab:
     "This is the first part of the media patches for v3.6.
      This patch series contain:
       - new DVB frontend: rtl2832
       - new video drivers: adv7393
       - some unused files got removed
       - a selection API cleanup between V4L2 and V4L2 subdev API's
       - a major redesign at v4l-ioctl2, in order to clean it up
       - several driver fixes and improvements."
    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (174 commits)
      v4l: Export v4l2-common.h in include/linux/Kbuild
      media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
      [media] media: Use pr_info not homegrown pr_reg macro
      [media] Terratec Cinergy S2 USB HD Rev.2
      [media] v4l: Correct conflicting V4L2 subdev selection API documentation
      [media] Feature removal: V4L2 selections API target and flag definitions
      [media] v4l: Unify selection flags documentation
      [media] v4l: Unify selection flags
      [media] v4l: Common documentation for selection targets
      [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
      [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
      [media] V4L: Remove "_ACTIVE" from the selection target name definitions
      [media] media: dvb-usb: print mac address via native %pM
      [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
      [media] media: gpio-ir-recv: add allowed_protos for platform data
      [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
      [media] saa7134: fix spelling of detach in label
      [media] cx88-blackbird: replace ioctl by unlocked_ioctl
      [media] cx88: don't use current_norm
      [media] cx88: fix a number of v4l2-compliance violations
i2c.h 23.7 KB