From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Dec 2008 18:24:52 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v2.6.28~1
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c20137fc5329eaf24093fc48c52608dc66be8e5c;hp=-c;p=linux-2.6-omap-h63xx.git

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

* '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
---

c20137fc5329eaf24093fc48c52608dc66be8e5c
diff --combined MAINTAINERS
index c42a567e010,d92299e4238..fbc8fa58d56
--- a/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