Merge commit 'v2.6.27-rc1' into x86/microcode

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 28f867d99a8c519c53828dc0626c5f33a0164ed8..4bfa468ceae244219e620dd0d827b0672ec639fa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3801,6 +3801,12 @@ P:       Ben Nizette
 M:     bn@niasdigital.com
 S:     Maintained
 
+SOC-CAMERA V4L2 SUBSYSTEM
+P:     Guennadi Liakhovetski
+M:     g.liakhovetski@gmx.de
+L:     video4linux-list@redhat.com
+S:     Maintained
+
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:     Ingo Molnar
 M:     mingo@redhat.com