• Linus Torvalds's avatar
    Merge branch 'origin' · b0500577
    Linus Torvalds authored
    Conflicts:
    	Documentation/video4linux/CARDLIST.cx88
    	drivers/media/video/cx88/Kconfig
    	drivers/media/video/em28xx/em28xx-video.c
    	drivers/media/video/saa7134/saa7134-dvb.c
    
    Resolved as in the original merge by Mauro Carvalho Chehab
    b0500577
vp7045.c 7.16 KB