mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 04:33:26 +02:00
Conflicts: drivers/media/dvb-frontends/stv090x.c drivers/media/pci/Makefile drivers/media/tuners/Makefile drivers/media/usb/cx231xx/cx231xx-cards.c drivers/media/usb/cx231xx/cx231xx-dvb.c drivers/media/usb/cx231xx/cx231xx.h drivers/media/usb/dvb-usb/Makefile