Merge branch 'v4l_for_linus' into staging/for_v3.2

* v4l_for_linus: (496 commits)
  [media] videodev: fix a NULL pointer dereference in v4l2_device_release()
  Linux 3.1-rc10
  Avoid using variable-length arrays in kernel/sys.c
  ARM: 7128/1: vic: Don't write to the read-only register VIC_IRQ_STATUS
  ARM: 7122/1: localtimer: add header linux/errno.h explicitly
  ARM: 7117/1: perf: fix HW_CACHE_* events on Cortex-A9
  x86, mrst: use a temporary variable for SFI irq
  hwmon: (w83627ehf) Properly report thermal diode sensors
  gpio-pca953x: fix gpio_base
  gpio/omap: fix build error with certain OMAP1 configs
  tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm files
  ide: Fix file references in drivers/ide/
  xfs: revert to using a kthread for AIL pushing
  xfs: force the log if we encounter pinned buffers in .iop_pushbuf
  xfs: do not update xa_last_pushed_lsn for locked items
  Btrfs: make sure not to defrag extents past i_size
  x86: Default to vsyscall=native for now
  Btrfs: fix recursive auto-defrag
  mscan: too much data copied to CAN frame due to 16 bit accesses
  gro: refetch inet6_protos[] after pulling ext headers
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/video/omap3isp/ispccdc.c
Simple merge