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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
  [media] radio-aimslab.c: Fix gcc 4.5+ bug
  [media] cx25821: Fix compilation breakage due to BKL dependency
  [media] v4l2-compat-ioctl32: fix compile warning
  [media] zoran: fix compiler warning
  [media] tda18218: fix compile warning
  [media] ngene: fix compile warning
  [media] DVB: IR support for TechnoTrend CT-3650
  [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
  [media] ir-nec-decoder: fix repeat key issue
  [media] staging: se401 depends on USB
  [media] staging: usbvideo/vicam depends on USB
  [media] soc_camera: Add the ability to bind regulators to soc_camedra devices
  [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
  [media] v4l: soc-camera: switch to .unlocked_ioctl
  [media] v4l: ov772x: simplify pointer dereference
  [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
  [media] ov9640: use macro to request OmniVision OV9640 sensor private data
  [media] ivtv-i2c: Fix two warnings
  [media] staging/lirc: Update lirc TODO files
  [media] cx88: Remove the obsolete i2c_adapter.id field
  ...

1 files changed, 0 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index db1c2b665a42..fd78afa0b147 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5754,12 +5754,6 @@ M:	Ion Badulescu <ionut@badula.org>
 S:      Odd Fixes
 F:      drivers/net/starfire*
 
-STRADIS MPEG-2 DECODER DRIVER
-M:      Nathan Laredo <laredo@gnu.org>
-W:      http://www.stradis.com/
-S:      Maintained
-F:      drivers/media/video/stradis.c
-
 SUN3/3X
 M:      Sam Creasey <sammy@sammy.net>
 W:      http://sammy.net/sun3/