Skip to content
  • Linus Torvalds's avatar
    Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · b6255ee3
    Linus Torvalds authored
    Pull media fixes from Mauro Carvalho Chehab:
     "For a some fix patches for v3.4, including a regression fix at DVB core"
    
    Fix up trivial conflicts in Documentation/feature-removal-schedule.txt
    
    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
      [media] gspca - sonixj: Fix a zero divide in isoc interrupt
      [media] media: videobuf2-dma-contig: include header for exported symbols
      [media] media: videobuf2-dma-contig: quiet sparse noise about plain integer as NULL pointer
      [media] media: vb2-memops: Export vb2_get_vma symbol
      [media] s5p-fimc: Correct memory allocation for VIDIOC_CREATE_BUFS
      [media] s5p-fimc: Fix locking in subdev set_crop op
      [media] dvb_frontend: fix a regression with DVB-S zig-zag
      [media] fintek-cir: change || to &&
      [media] V4L: Schedule V4L2_CID_HCENTER, V4L2_CID_VCENTER controls for removal
      [media] rc: Postpone ISR registration
      [media] marv...
    b6255ee3