Merge tag 'for-3.11-rc1' of git://gitorious.org/linux-pwm/linux-pwm
[cascardo/linux.git] / MAINTAINERS
index 3c433ae..37f9a71 100644 (file)
@@ -6568,8 +6568,8 @@ S:        Maintained
 F:     drivers/media/usb/pwc/*
 
 PWM SUBSYSTEM
-M:     Thierry Reding <thierry.reding@avionic-design.de>
-L:     linux-kernel@vger.kernel.org
+M:     Thierry Reding <thierry.reding@gmail.com>
+L:     linux-pwm@vger.kernel.org
 S:     Maintained
 W:     http://gitorious.org/linux-pwm
 T:     git git://gitorious.org/linux-pwm/linux-pwm.git