diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /MAINTAINERS | |
| parent | 482e6f8466ab1066f1a969bcdbe916b56439622c (diff) | |
| parent | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7a0baf8fd18c..969b84bb8462 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 |