diff --git a/[refs] b/[refs] index 59aba66b773e..468d82d9f57d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91952bc0b48ad722cf40f39dff9b76d106c95a4c +refs/heads/master: aa3c598b008782afd9b7c4ccef670d114786cece diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 1323df0791d7..4e0752151c31 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3329,6 +3329,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/ +STK1160 USB VIDEO CAPTURE DRIVER +M: Ezequiel Garcia +L: linux-media@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git +S: Maintained +F: drivers/media/usb/stk1160/ + HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER M: Frank Seidel L: platform-driver-x86@vger.kernel.org