Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork:
  [media] videobuf2: correct the #ifndef text mistake in videobuf2-dma-contig.h
  [media] lirc_sir: make device registration work
  [media] DVB: stb0899: speed up getting BER values
  [media] media: video: bt8xx: Remove duplicated pixel format entry
  [media] s5p-fimc: Add missing static storage class specifiers
  [media] videobuf-dma-contig: use gfp_t for GFP flags
  [media] gspca: Maintainer change
  [media] v4l: Correct create_bufs documentation
  [media] mt9m032: Implement V4L2_CID_PIXEL_RATE control
  [media] mt9p031: Implement V4L2_CID_PIXEL_RATE control
  [media] mt9t001: Implement V4L2_CID_PIXEL_RATE control

Conflicts:
	Documentation/DocBook/media/v4l/vidioc-create-bufs.xml

diff --cc drivers/media/video/bt8xx/bttv-driver.c
Simple merge

diff --cc drivers/media/video/s5p-fimc/fimc-core.c
Simple merge