diff --git a/[refs] b/[refs] index 85e4e4a76968..4dc361ddb6f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c117ab8420013a6c20feca11c78858229b3c6763 +refs/heads/master: 9819da66c81f2fbe3f8bcaa55defe756525c81c0 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 867a6a829ab6..f524e90a525c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2632,7 +2632,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