diff --git a/[refs] b/[refs] index 4c82cc0049a3..c013811b79cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb1cc0758074519bd0ac4d534d4a6b1ec7c811b5 +refs/heads/master: 3408d886173ff57c91bdeda9c3c35c62b5fac1be diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 46cf22a8bbf5..c4f8cf91c0db 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2669,7 +2669,7 @@ W: http://github.com/mkrufky Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/media_tree.git S: Maintained -F: drivers/media/usb/dvb-usb-v2/cxusb* +F: drivers/media/usb/dvb-usb/cxusb* DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER M: Antti Palosaari