Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mcheh...
[sfrench/cifs-2.6.git] / .gitattributes
1 *.c   diff=cpp
2 *.h   diff=cpp