diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:38:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:38:12 -0400 |
| commit | e620d1e39aa33b43bed96aa7f2ebbc88914aed58 (patch) | |
| tree | 0e8a0c36430f10c1e490464f1d6524ce5612f614 /MAINTAINERS | |
| parent | d2dd328b7f7bc6cebe167648289337755944ad2a (diff) | |
| parent | 666092c679f7d9eb9f5230087f960a487fda721c (diff) | |
Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (87 commits)
V4L/DVB: ivtv: Timing tweaks and code re-order to try and improve stability
V4L/DVB: ivtv: Avoid accidental video standard change
V4L/DVB: ivtvfb : Module load / unload fixes
V4L/DVB: cx2341x: Report correct temporal setting for log-status
V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address
V4L/DVB: drivers/media: Eliminate a NULL pointer dereference
V4L/DVB: dvb-core: Fix ULE decapsulation bug
V4L/DVB: Bug fix: make IR work again for dm1105
V4L/DVB: media/IR: nec-decoder needs to select BITREV
V4L/DVB: video/saa7134: change dprintk() to i2cdprintk()
V4L/DVB: video/saa7134: remove duplicate break
V4L/DVB: IR/imon: add auto-config for 0xffdc rf device
V4L/DVB: IR/imon: clean up usage of bools
V4L/DVB: em28xx: remove unneeded null checks
V4L/DVB: ngene: remove unused #include <linux/version.h>
V4L/DVB: ak881x needs slab.h
V4L/DVB: FusionHDTV: Use quick reads for I2C IR device probing
V4L/DVB: Technotrend S2-3200 ships with a TT 1500 remote
V4L/DVB: drivers/media: Use kzalloc
V4L/DVB: m920x: Select simple tuner
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a73dd8030afa..67accd730ac9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1731,7 +1731,7 @@ S: Maintained | |||
| 1731 | F: sound/pci/cs5535audio/ | 1731 | F: sound/pci/cs5535audio/ |
| 1732 | 1732 | ||
| 1733 | CX18 VIDEO4LINUX DRIVER | 1733 | CX18 VIDEO4LINUX DRIVER |
| 1734 | M: Andy Walls <awalls@radix.net> | 1734 | M: Andy Walls <awalls@md.metrocast.net> |
| 1735 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) | 1735 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) |
| 1736 | L: linux-media@vger.kernel.org | 1736 | L: linux-media@vger.kernel.org |
| 1737 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git | 1737 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git |
| @@ -3165,7 +3165,7 @@ F: Documentation/hwmon/it87 | |||
| 3165 | F: drivers/hwmon/it87.c | 3165 | F: drivers/hwmon/it87.c |
| 3166 | 3166 | ||
| 3167 | IVTV VIDEO4LINUX DRIVER | 3167 | IVTV VIDEO4LINUX DRIVER |
| 3168 | M: Andy Walls <awalls@radix.net> | 3168 | M: Andy Walls <awalls@md.metrocast.net> |
| 3169 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) | 3169 | L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) |
| 3170 | L: linux-media@vger.kernel.org | 3170 | L: linux-media@vger.kernel.org |
| 3171 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git | 3171 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git |