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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB (9920): em28xx: fix NULL pointer dereference in call to VIDIOC_INT_RESET command
  V4L/DVB (9908a): MAINTAINERS: mark linux-uvc-devel as subscribers only
  V4L/DVB (9906): v4l2-compat: test for unlocked_ioctl as well.
  V4L/DVB (9885): drivers/media Kconfig's: fix bugzilla #12204
  V4L/DVB (9875): gspca - main: Fix vidioc_s_jpegcomp locking.
  V4L/DVB (9781): [PATCH] Cablestar 2 I2C retries (fix CableStar2 support)
  V4L/DVB (9780): dib0700: Stop repeating after user stops pushing button

diff --combined MAINTAINERS
index c42a567e010c7db73ef761370179e346867aaf3e,d92299e42385adb99cf4d2a3aed8a136e410e3a6..fbc8fa58d56d4ec7cd09603341a4941f0a42788c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1527,10 -1527,10 +1527,10 @@@ W:   http://ebtables.sourceforge.net
  S:    Maintained
  
  ECRYPT FILE SYSTEM
 -P:    Mike Halcrow, Phillip Hellewell
 -M:    mhalcrow@us.ibm.com, phillip@hellewell.homeip.net
 -L:    ecryptfs-devel@lists.sourceforge.net
 -W:    http://ecryptfs.sourceforge.net/
 +P:    Tyler Hicks, Dustin Kirkland
 +M:    tyhicks@linux.vnet.ibm.com, kirkland@canonical.com
 +L:    ecryptfs-devel@lists.launchpad.net
 +W:    https://launchpad.net/ecryptfs
  S:    Supported
  
  EDAC-CORE
@@@ -2191,9 -2191,9 +2191,9 @@@ S:      Supporte
  
  INOTIFY
  P:    John McCutchan
 -M:    ttb@tentacle.dhs.org
 +M:    john@johnmccutchan.com
  P:    Robert Love
 -M:    rml@novell.com
 +M:    rlove@rlove.org
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
@@@ -4529,7 -4529,7 +4529,7 @@@ S:      Maintaine
  USB VIDEO CLASS
  P:    Laurent Pinchart
  M:    laurent.pinchart@skynet.be
- L:    linux-uvc-devel@lists.berlios.de
+ L:    linux-uvc-devel@lists.berlios.de (subscribers-only)
  L:    video4linux-list@redhat.com
  W:    http://linux-uvc.berlios.de
  S:    Maintained