Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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] marvell-cam: fix an ARM build error
  [media] V4L: soc-camera: protect hosts during probing from overzealous user-space

diff --cc Documentation/feature-removal-schedule.txt
index 03ca210406edfcbe90fc58cd006ef0e7d313b42f,576257f180ebfe1291a6577ec2568442b0929462..e4b57756b9f55a7786adab34da6bcb70ef31beaa
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -505,37 -513,24 +505,47 @@@ Who:    Bjorn Helgaas <bhelgaas@google.com
  
  ----------------------------
  
 -What: The CAP9 SoC family will be removed
 -When: 3.4
 -Files:        arch/arm/mach-at91/at91cap9.c
 -      arch/arm/mach-at91/at91cap9_devices.c
 -      arch/arm/mach-at91/include/mach/at91cap9.h
 -      arch/arm/mach-at91/include/mach/at91cap9_matrix.h
 -      arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
 -      arch/arm/mach-at91/board-cap9adk.c
 -Why:  The code is not actively maintained and platforms are now hard to find.
 -Who:  Nicolas Ferre <nicolas.ferre@atmel.com>
 -      Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
 +What: Low Performance USB Block driver ("CONFIG_BLK_DEV_UB")
 +When: 3.6
 +Why:  This driver provides support for USB storage devices like "USB
 +      sticks". As of now, it is deactivated in Debian, Fedora and
 +        Ubuntu. All current users can switch over to usb-storage
 +        (CONFIG_USB_STORAGE) which only drawback is the additional SCSI
 +        stack.
 +Who:  Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
 +
 +----------------------------
 +
 +What: kmap_atomic(page, km_type)
 +When: 3.5
 +Why:  The old kmap_atomic() with two arguments is deprecated, we only
 +      keep it for backward compatibility for few cycles and then drop it.
 +Who:  Cong Wang <amwang@redhat.com>
 +
 +----------------------------
 +
 +What: get_robust_list syscall
 +When: 2013
 +Why:  There appear to be no production users of the get_robust_list syscall,
 +      and it runs the risk of leaking address locations, allowing the bypass
 +      of ASLR. It was only ever intended for debugging, so it should be
 +      removed.
 +Who:  Kees Cook <keescook@chromium.org>
 +
 +----------------------------
 +
 +What: setitimer accepts user NULL pointer (value)
 +When: 3.6
 +Why:  setitimer is not returning -EFAULT if user pointer is NULL. This
 +      violates the spec.
 +Who:  Sasikantha Babu <sasikanth.v19@gmail.com>
+ 
+ ----------------------------
+ 
+ What: V4L2_CID_HCENTER, V4L2_CID_VCENTER V4L2 controls
+ When: 3.7
+ Why:  The V4L2_CID_VCENTER, V4L2_CID_HCENTER controls have been deprecated
+       for about 4 years and they are not used by any mainline driver.
+       There are newer controls (V4L2_CID_PAN*, V4L2_CID_TILT*) that provide
+       similar functionality.
+ Who:  Sylwester Nawrocki <sylvester.nawrocki@gmail.com>