diff --git a/[refs] b/[refs] index 3b161a468c73..09f9e5d6c0df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cefea792137c163529c12090c93b693d29166c60 +refs/heads/master: be8c268a221cbe25025f30e697968cfcd8e78c94 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f471adfab417..c67d606e8477 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6274,16 +6274,6 @@ S: Supported F: drivers/usb/host/xhci* F: drivers/usb/host/pci-quirks* -USB ZC0301 DRIVER -M: Luca Risolia -L: linux-usb@vger.kernel.org -L: linux-media@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git -W: http://www.linux-projects.org -S: Maintained -F: Documentation/video4linux/zc0301.txt -F: drivers/media/video/zc0301/ - USB ZD1201 DRIVER L: linux-wireless@vger.kernel.org W: http://linux-lc100020.sourceforge.net