diff --git a/[refs] b/[refs] index c85fcc6143f3..61ba60addbfc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6c9b34c300c09f53c74d2769e63a9133c135ae9 +refs/heads/master: 39532e6c94f9561c49a1fd8f695c7445a1da1e79 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 45d831b522da..d04cfadcc129 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5897,6 +5897,13 @@ S: Maintained F: Documentation/video4linux/README.pvrusb2 F: drivers/media/usb/pvrusb2/ +PWC WEBCAM DRIVER +M: Hans de Goede +L: linux-media@vger.kernel.org +T: git git://linuxtv.org/media_tree.git +S: Maintained +F: drivers/media/usb/pwc/* + PWM SUBSYSTEM M: Thierry Reding L: linux-kernel@vger.kernel.org