diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /MAINTAINERS | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4f7b64a824ae..c77df0f449de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4377,7 +4377,7 @@ S: Maintained | |||
| 4377 | USB VIDEO CLASS | 4377 | USB VIDEO CLASS |
| 4378 | P: Laurent Pinchart | 4378 | P: Laurent Pinchart |
| 4379 | M: laurent.pinchart@skynet.be | 4379 | M: laurent.pinchart@skynet.be |
| 4380 | L: linx-uvc-devel@berlios.de | 4380 | L: linux-uvc-devel@lists.berlios.de |
| 4381 | L: video4linux-list@redhat.com | 4381 | L: video4linux-list@redhat.com |
| 4382 | W: http://linux-uvc.berlios.de | 4382 | W: http://linux-uvc.berlios.de |
| 4383 | S: Maintained | 4383 | S: Maintained |