Merge branch 'linus' into core/generic-dma-coherent
[firefly-linux-kernel-4.4.55.git] / drivers / media / video / saa7196.h